original_kernel/arch/arm/plat-s5p
Kukjin Kim d61bd77ff1 Merge branch 'next-samsung' into for-next
Conflicts:
	arch/arm/mach-s5p6440/Kconfig
	arch/arm/mach-s5p6442/Kconfig
	arch/arm/mach-s5pc100/Kconfig
	arch/arm/mach-s5pv210/Kconfig
	arch/arm/mach-s5pv210/cpu.c
	arch/arm/plat-samsung/include/plat/sdhci.h
2010-08-06 21:49:18 +09:00
..
include/plat Merge branch 'next-s5p' into for-next 2010-08-06 21:34:55 +09:00
Kconfig ARM: S5PV310: Add new Kconfig and Makefiles 2010-08-05 18:32:42 +09:00
Makefile Merge branch 'next-samsung' into for-next 2010-08-06 21:49:18 +09:00
clock.c
cpu.c Merge branch 'next-s5p' into for-next 2010-08-06 21:34:55 +09:00
dev-fimc0.c ARM: SAMSUNG: Add platform definitions and helpers for FIMC driver 2010-08-06 21:28:35 +09:00
dev-fimc1.c ARM: SAMSUNG: Add platform definitions and helpers for FIMC driver 2010-08-06 21:28:35 +09:00
dev-fimc2.c ARM: SAMSUNG: Add platform definitions and helpers for FIMC driver 2010-08-06 21:28:35 +09:00
dev-pmu.c
dev-uart.c
irq-eint.c
irq.c ARM: S5PV310: Add IRQ support 2010-08-05 18:32:41 +09:00