kevin/linux
1
Fork 0
Code
cfaf8fc5b5
linux/arch/arm/mach-s3c64xx
History
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
..
include/mach Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
clock.c Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2 2011-10-04 20:20:08 +09:00
cpu.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
dev-audio.c
dev-spi.c ARM: SAMSUNG: Add tx_st_done variable 2011-07-06 15:03:08 +09:00
dev-uart.c
dma.c Merge branch 'next/topic-dma-samsung' into next-samsung-devel 2011-10-04 18:57:38 +09:00
irq-eint.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
irq-pm.c ARM / Samsung: Use struct syscore_ops for "core" power management 2011-04-24 19:16:10 +02:00
irq.c ARM: S3C64XX: Ensure VIC based IRQs can be resumed from 2011-07-20 23:12:22 +09:00
Kconfig ARM: S3C64XX: Use module identification for Cragganmore system builds 2011-09-19 16:32:36 +09:00
mach-anw6410.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-crag6410-module.c ARM: S3C64XX: Add devices for Kilchoman audio module on Cragganmore 2011-09-19 16:33:03 +09:00
mach-crag6410.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-hmt.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-mini6410.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-ncp.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-real6410.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-smartq5.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-smartq7.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-smartq.c
mach-smartq.h
mach-smdk6400.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
mach-smdk6410.c Merge branch 'depends/rmk/memory_h' into next/cleanup2 2011-11-01 04:58:59 +01:00
Makefile ARM: S3C64XX: To merge devs.c files to one devs.c 2011-10-06 11:14:59 +09:00
Makefile.boot
pm.c ARM: S3C64XX: Save/restore S3C64XX_MODEM_MIFPCON on suspend/resume 2011-09-19 16:38:05 +09:00
s3c6400.c ARM: SAMSUNG: Moving each SoC support header files 2011-10-04 19:48:43 +09:00
s3c6410.c ARM: SAMSUNG: Moving each SoC support header files 2011-10-04 19:48:43 +09:00
setup-fb-24bpp.c ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx 2011-07-21 02:11:39 +09:00
setup-i2c0.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-i2c1.c ARM: S3C64XX: Remove gpio-bank-X header files 2011-05-06 09:37:36 +09:00
setup-ide.c
setup-keypad.c
setup-sdhci-gpio.c
setup-sdhci.c ARM: SAMSUNG: remove sdhci default configuration setup platform helper 2011-10-04 19:48:40 +09:00
sleep.S ARM: pm: samsung: move cpu_suspend into C code 2011-06-24 08:48:44 +01:00