linux/arch
David S. Miller 88c5100c28 Merge branch 'master' of github.com:davem330/net
Conflicts:
	net/batman-adv/soft-interface.c
2011-10-07 13:38:43 -04:00
..
alpha
arm Merge branch 'samsung-fixes-3' of git://github.com/kgene/linux-samsung 2011-09-26 16:29:26 -07:00
avr32
blackfin
cris Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
frv
h8300
ia64 Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
m32r
m68k
microblaze
mips Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
mn10300
openrisc
parisc
powerpc Merge branch 'master' of github.com:davem330/net 2011-10-07 13:38:43 -04:00
s390 Merge branch 'master' of github.com:davem330/net 2011-10-07 13:38:43 -04:00
score
sh net: sh_eth: move the asm/sh_eth.h to include/linux/ 2011-09-28 13:41:51 -04:00
sparc sparc64: Force the execute bit in OpenFirmware's translation entries. 2011-09-29 12:18:59 -07:00
tile
um Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
unicore32
x86 x86/PCI: use host bridge _CRS info on ASUS M2V-MX SE 2011-10-06 16:10:37 -07:00
xtensa Merge branch 'master' of github.com:davem330/net 2011-09-22 03:23:13 -04:00
.gitignore
Kconfig