mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 01:40:30 +00:00
cfaf8fc5b5
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> |
||
---|---|---|
.. | ||
include/mach | ||
bast-ide.c | ||
bast-irq.c | ||
cpu-freq.c | ||
dma.c | ||
h1940-bluetooth.c | ||
Kconfig | ||
mach-amlm5900.c | ||
mach-bast.c | ||
mach-h1940.c | ||
mach-n30.c | ||
mach-otom.c | ||
mach-qt2410.c | ||
mach-smdk2410.c | ||
mach-tct_hammer.c | ||
mach-vr1000.c | ||
Makefile | ||
Makefile.boot | ||
nor-simtec.c | ||
nor-simtec.h | ||
pll.c | ||
pm-h1940.S | ||
pm.c | ||
s3c2410.c | ||
sleep.S | ||
usb-simtec.c | ||
usb-simtec.h |