David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: include/linux/netdevice.h net/core/sock.c Trivial merge issues. Removal of "extern" for functions declaration in netdevice.h at the same time "const" was added to an argument. Two parallel line additions in net/core/sock.c Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-08 23:07:53 -04:00
..
acpi	Merge branch 'acpi-hotplug'	2013-08-30 14:14:25 +02:00
asm-generic	include/asm-generic/vtime.h: avoid zero-length file	2013-09-30 14:31:02 -07:00
clocksource	ARM: SoC cleanups for 3.12	2013-09-06 13:21:16 -07:00
crypto	crypto: scatterwalk - Add support for calculating number of SG elements	2013-08-21 21:27:58 +10:00
drm	Revert "drm: mark context support as a legacy subsystem"	2013-09-20 08:32:59 +10:00
dt-bindings	Device tree core updates for v3.12	2013-09-10 13:53:52 -07:00
keys
kvm	ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256	2013-08-30 16:12:39 +03:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-08 23:07:53 -04:00
math-emu
media	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-09-05 14:54:29 -07:00
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-08 23:07:53 -04:00
pcmcia
ras
rdma	Merge branches 'cxgb4', 'flowsteer', 'ipoib', 'iser', 'mlx4', 'ocrdma' and 'qib' into for-next	2013-09-03 09:01:08 -07:00
rxrpc
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2013-09-12 16:11:45 -07:00
sound	sound fixes for 3.12-rc1	2013-09-12 08:52:41 -07:00
target	target/iscsi: Bump versions to v4.1.0	2013-09-10 20:23:37 -07:00
trace	Merge branch 'for-3.12/core' of git://git.kernel.dk/linux-block	2013-09-22 15:00:11 -07:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-08 23:07:53 -04:00
video	fbdev changes for 3.12:	2013-09-05 09:49:32 -07:00
xen	Features:	2013-09-04 17:45:39 -07:00
Kbuild