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
..
alpha	word-at-a-time.h: support zero_bytemask() on alpha and tile	2015-10-06 14:53:16 -04:00
arc
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
arm64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
avr32
blackfin
c6x
cris
frv
h8300	word-at-a-time.h: fix some Kbuild files	2015-10-06 14:52:48 -04:00
hexagon
ia64
m32r
m68k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
metag
microblaze
mips	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
mn10300
nios2
openrisc
parisc
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
score
sh	sh: add copy_user_page() alias for __copy_user()	2015-10-16 11:42:28 -07:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
tile	word-at-a-time.h: support zero_bytemask() on alpha and tile	2015-10-06 14:53:16 -04:00
um
unicore32
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
xtensa
.gitignore
Kconfig