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

…

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

…

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

…

m32r

…

m68k

…

metag

…

microblaze

…

mips

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-06-06 22:20:08 -04:00

mn10300

…

nios2

…

openrisc

…

parisc

…

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

…