David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflicts were two cases of overlapping changes in batman-adv and the qed driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-06-15 11:59:32 -04:00
..
alpha	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-05-22 23:32:48 -04:00
arc	Kbuild UAPI header export updates for v4.12	2017-05-10 20:45:36 -07:00
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
arm64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
blackfin	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
c6x	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
cris	devicetree: Move include prefixes from arch to separate directory	2017-05-18 23:55:48 -07:00
frv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-06 22:20:08 -04:00
h8300	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
hexagon	hexagon: Use raw_copy_to_user	2017-06-10 19:10:31 -07:00
ia64	net: Define SCM_TIMESTAMPING_PKTINFO on all architectures.	2017-05-21 23:13:37 -04:00
m32r	net: Define SCM_TIMESTAMPING_PKTINFO on all architectures.	2017-05-21 23:13:37 -04:00
m68k	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
metag	devicetree: Move include prefixes from arch to separate directory	2017-05-18 23:55:48 -07:00
microblaze	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
mips	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-06 22:20:08 -04:00
mn10300	net: Define SCM_TIMESTAMPING_PKTINFO on all architectures.	2017-05-21 23:13:37 -04:00
nios2	nios2 update for v4.12-rc1	2017-05-12 09:53:16 -07:00
openrisc	kthread: fix boot hang (regression) on MIPS/OpenRISC	2017-05-29 09:40:54 -07:00
parisc	net: Fix parisc SCM_TIMESTAMPING_PKTINFO value.	2017-05-22 10:26:24 -04:00
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
score	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
sh	Kbuild UAPI header export updates for v4.12	2017-05-10 20:45:36 -07:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
tile	arch/include: remove empty Kbuild files	2017-05-11 00:22:18 +09:00
um	Merge branch 'for-linus-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml	2017-05-13 10:20:02 -07:00
unicore32	Kbuild UAPI header export updates for v4.12	2017-05-10 20:45:36 -07:00
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
xtensa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
.gitignore
Kconfig	Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-05-10 10:30:46 -07:00