David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Lots of easy overlapping changes in the confict
resolutions here.

Signed-off-by: David S. Miller <davem@davemloft.net>

2018-05-26 19:46:15 -04:00

..

alpha

alpha: io: reorder barriers to guarantee writeX() and iowriteX() ordering #2

2018-05-22 18:10:36 -07:00

arc

…

arm

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

2018-05-26 19:46:15 -04:00

arm64

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

2018-05-26 19:46:15 -04:00

c6x

…

h8300

…

hexagon

…

ia64

…

m68k

…

microblaze

…

mips

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

2018-05-21 16:01:54 -04:00

nds32

…

nios2

…

openrisc

…

parisc

parisc: Move setup_profiling_timer() out of init section

2018-05-18 16:21:49 +02:00

powerpc

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

2018-05-26 19:46:15 -04:00

riscv

…

s390

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

2018-05-21 16:01:54 -04:00

sh

…

sparc

bpf, sparc: remove unused variable

2018-05-14 19:11:45 -07:00

um

…

unicore32

…

x86

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

2018-05-26 19:46:15 -04:00

xtensa

…

.gitignore

…

Kconfig

…