linux_dsm_epyc7002/arch
David S. Miller d5ef8a4d87 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/infiniband/hw/nes/nes_cm.c

Simple whitespace conflict.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-02-10 23:32:28 -05:00
..
alpha
arm Serial/TTY fixes for the 3.3-rc3 tree 2012-02-09 13:52:57 -08:00
avr32 avr32: select generic atomic64_t support 2012-02-03 16:16:40 -08:00
blackfin
c6x
cris
frv
h8300
hexagon
ia64 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 2012-01-18 15:51:48 -08:00
m32r
m68k Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 2012-01-26 12:43:57 -08:00
microblaze Revert "microblaze: Add topology init" 2012-01-31 09:06:52 +01:00
mips mips: use the the PCI controller's io_map_base 2012-01-31 23:20:30 +02:00
mn10300
openrisc Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2012-01-16 14:34:54 -08:00
parisc
powerpc powerpc: Fix build on some non-freescale platforms 2012-01-25 13:33:22 +11:00
s390 qeth: add query OSA address table support 2012-02-08 18:50:20 -05:00
score score: fix off-by-one index into syscall table 2012-01-23 08:38:49 -08:00
sh sh: use the the PCI channels's io_map_base 2012-01-31 23:21:19 +02:00
sparc lib: Fix multiple definitions of clz_tab 2012-02-02 10:34:23 +11:00
tile
um Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit 2012-01-17 16:41:31 -08:00
unicore32
x86 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-02-10 09:05:07 -08:00
xtensa xtensa: fix memscan() 2012-02-03 16:16:40 -08:00
.gitignore
Kconfig