David S. Miller 0c1072ae02 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/freescale/fec_main.c drivers/net/ethernet/renesas/sh_eth.c net/ipv4/gre.c The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list) and the splitting of the gre.c code into seperate files. The FEC conflict was two sets of changes adding ethtool support code in an "!CONFIG_M5272" CPP protected block. Finally the sh_eth.c conflict was between one commit add bits set in the .eesr_err_check mask whilst another commit removed the .tx_error_check member and assignments. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-07-03 14:55:13 -07:00
..
acpi	ACPI / dock / PCI: Synchronous handling of dock events for PCI devices	2013-06-24 11:22:53 +02:00
asm-generic	Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2013-06-11 11:16:43 -07:00
clocksource
crypto
drm
dt-bindings
keys
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-07-03 14:55:13 -07:00
math-emu
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-06-18 06:25:08 -10:00
memory
misc
net	net: gre: move GSO functions to gre_offload	2013-07-03 14:37:39 -07:00
pcmcia
ras
rdma
rxrpc
scsi
sound	ASoC: dapm: Treat DAI widgets like AIF widgets for power	2013-06-07 15:54:50 +01:00
target	target: Propigate up ->cmd_kref put return via transport_generic_free_cmd	2013-05-31 01:21:23 -07:00
trace
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-07-03 14:55:13 -07:00
video	Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into linux-fbdev/for-3.10-fixes	2013-05-29 17:00:34 +08:00
xen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-06-05 16:37:30 -07:00
Kbuild