mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +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 | ||
clock.c | ||
dma.c | ||
dsc.c | ||
irq.c | ||
Kconfig | ||
mach-anubis.c | ||
mach-at2440evb.c | ||
mach-gta02.c | ||
mach-mini2440.c | ||
mach-nexcoder.c | ||
mach-osiris-dvs.c | ||
mach-osiris.c | ||
mach-rx1950.c | ||
mach-rx3715.c | ||
mach-smdk2440.c | ||
Makefile | ||
s3c244x-clock.c | ||
s3c244x-irq.c | ||
s3c244x.c | ||
s3c2440-cpufreq.c | ||
s3c2440-pll-12000000.c | ||
s3c2440-pll-16934400.c | ||
s3c2440.c | ||
s3c2442.c |