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
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
c6x
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
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
metag	devicetree: Move include prefixes from arch to separate directory	2017-05-18 23:55:48 -07:00
microblaze
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
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
sh
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-06-15 11:59:32 -04:00
tile
um
unicore32
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