linux/arch
David S. Miller f6d3125fa3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/dsa/slave.c

net/dsa/slave.c simply had overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-02 07:21:25 -07:00
..
alpha PCI updates for v4.3: 2015-09-25 11:16:53 -07:00
arc
arm Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-10-02 07:21:25 -07:00
arm64 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-09-26 16:08:27 -07:00
avr32
blackfin
c6x
cris
frv
h8300
hexagon
ia64 PCI updates for v4.3: 2015-09-25 11:16:53 -07:00
m32r
m68k m68k/mac: Export Peripheral System Controller (PSC) base address to modules 2015-09-29 21:11:13 -07:00
metag
microblaze
mips Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2015-09-27 18:22:34 -04:00
mn10300
nios2
openrisc
parisc
powerpc PCI updates for v4.3: 2015-09-25 11:16:53 -07:00
s390 AMD fixes for bugs introduced in the 4.2 merge window, 2015-09-25 10:51:40 -07:00
score
sh
sparc
tile Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 2015-09-28 12:27:18 -04:00
um
unicore32
x86 Merge branch 'akpm' (patches from Andrew) 2015-10-01 22:20:11 -04:00
xtensa
.gitignore
Kconfig