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	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
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	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
blackfin	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
c6x	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
cris	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
frv	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
h8300	word-at-a-time.h: fix some Kbuild files	2015-10-06 14:52:48 -04:00
hexagon	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
ia64	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
m32r	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
m68k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
metag	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
microblaze	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
mips	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
mn10300	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
nios2	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
openrisc	dma-mapping: consolidate dma_set_mask	2015-09-10 13:29:01 -07:00
parisc	parisc: Use platform_device_register_simple("rtc-generic")	2015-09-08 17:53:48 +02:00
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	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
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	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
unicore32	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-10-20 06:08:27 -07:00
xtensa	Merge branch 'strscpy' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2015-10-04 16:31:13 +01:00
.gitignore
Kconfig	kexec: split kexec_load syscall from kexec core code	2015-09-10 13:29:01 -07:00