David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/asix_common.c net/ipv4/inet_connection_sock.c net/switchdev/switchdev.c In the inet_connection_sock.c case the request socket hashing scheme is completely different in net-next. The other two conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-10-20 06:08:27 -07:00
..
acpi
asm-generic	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
clocksource
crypto
drm	drm/dp/mst: make mst i2c transfer code more robust.	2015-10-15 09:06:20 +10:00
dt-bindings
keys
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
math-emu
media
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
pcmcia
ras
rdma
rxrpc
scsi
soc
sound
target	target: Propigate backend read-only to core_tpg_add_lun	2015-09-24 23:17:21 -07:00
trace
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
video
xen	x86/xen: Support kexec/kdump in HVM guests by doing a soft reset	2015-09-28 14:48:52 +01:00
Kbuild