1
linux/arch
Arnd Bergmann cfaf8fc5b5 Merge branch 'depends/rmk/memory_h' into next/cleanup2
There are lots of conflicts between the omap and exynos cleanups
and the memory.h remove series.

Conflicts:
	arch/arm/mach-exynos4/mach-smdkc210.c
	arch/arm/mach-exynos4/mach-smdkv310.c
	arch/arm/mach-imx/mach-cpuimx27.c
	arch/arm/mach-omap1/board-ams-delta.c
	arch/arm/mach-omap1/board-generic.c
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/board-nokia770.c
	arch/arm/mach-omap1/board-osk.c
	arch/arm/mach-omap1/board-palmte.c
	arch/arm/mach-omap1/board-palmtt.c
	arch/arm/mach-omap1/board-palmz71.c
	arch/arm/mach-omap1/board-sx1.c
	arch/arm/mach-omap1/board-voiceblue.c
	arch/arm/mach-omap1/io.c
	arch/arm/mach-omap2/board-generic.c
	arch/arm/mach-omap2/io.c
	arch/arm/plat-omap/io.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-11-01 04:58:59 +01:00
..
alpha
arm Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
avr32
blackfin
cris
frv
h8300
ia64
m32r
m68k
microblaze
mips
mn10300
openrisc
parisc
powerpc
s390 [S390] kvm: extension capability for new address space layout 2011-09-20 17:07:34 +02:00
score
sh
sparc
tile
um
unicore32
x86 KVM: x86 emulator: fix Src2CL decode 2011-09-25 19:14:58 +03:00
xtensa
.gitignore
Kconfig