David S. Miller 638d3c6381 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/bridge/br_mdb.c Minor conflict in br_mdb.c, in 'net' we added a memset of the on-stack 'ip' variable whereas in 'net-next' we assign a new member 'vid'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-07-13 17:28:09 -07:00
..
acpi
asm-generic
clocksource
crypto
drm
dt-bindings
keys
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-13 17:28:09 -07:00
math-emu
media
memory
misc
net
pcmcia
ras
rdma
rxrpc
scsi
soc
sound
target
trace
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-13 17:28:09 -07:00
video
xen
Kbuild