linux_dsm_epyc7002/arch
Arnd Bergmann eed1e57650 Merge branch 'stericsson/cleanup' into next/timer
The timer and cleanup branches from stericsson conflict,
so I'm merging them here.

Conflicts:
	arch/arm/mach-ux500/Makefile
	arch/arm/mach-ux500/cpu.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-10-31 23:42:23 +01:00
..
alpha alpha, gpio: GENERIC_GPIO default must be n 2011-09-14 18:09:37 -07:00
arm Merge branch 'stericsson/cleanup' into next/timer 2011-10-31 23:42:23 +01:00
avr32
blackfin
cris
frv
h8300
ia64
m32r
m68k
microblaze
mips
mn10300
openrisc Add missing DMA ops 2011-09-11 09:50:39 +02:00
parisc
powerpc
s390
score
sh
sparc
tile
um um: fix strrchr() problems 2011-09-14 18:09:37 -07:00
unicore32
x86 Merge branch 'stable/bug.fixes' of git://oss.oracle.com/git/kwilk/xen 2011-09-16 11:28:11 -07:00
xtensa
.gitignore
Kconfig