kernel_optimize_test/arch/arm/mach-exynos
Arnd Bergmann bde755679a Merge branch 'samsung/cleanup-exynos-clock' into next/soc
Conflicts:
	arch/arm/mach-exynos/clock-exynos4.c
	arch/arm/mach-exynos/clock.c

The cleanup moves the exynos4 clock implementation away, while
the other branch modifies the file with the old name.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-20 10:07:48 +00:00
..
include/mach Merge branch 'samsung/cleanup-exynos-clock' into next/soc 2012-03-20 10:07:48 +00:00
clock-exynos4.c Merge branch 'samsung/cleanup-exynos-clock' into next/soc 2012-03-20 10:07:48 +00:00
clock-exynos4.h ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock 2012-03-10 22:29:01 -08:00
clock-exynos4210.c ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock 2012-03-10 22:29:01 -08:00
clock-exynos4212.c ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock 2012-03-10 22:29:01 -08:00
common.c Merge branch 'samsung/cleanup-exynos-clock' into next/soc 2012-03-20 10:07:48 +00:00
common.h ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock 2012-03-10 22:29:01 -08:00
cpuidle.c ARM: EXYNOS: Add support AFTR mode on EXYNOS4210 2012-03-09 07:04:43 -08:00
dev-ahci.c
dev-audio.c
dev-dwmci.c
dev-ohci.c ARM: EXYNOS: Add USB OHCI device 2011-12-23 11:21:28 +09:00
dev-pd.c
dev-sysmmu.c
dma.c Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static 2012-03-07 03:34:41 -08:00
headsmp.S ARM: exynos: remove incorrect BSYM usage 2012-01-16 08:36:04 -06:00
hotplug.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
Kconfig Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
mach-armlex4210.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-exynos4-dt.c ARM: EXYNOS: Bring exynos4-dt up to date 2012-02-09 18:40:22 +09:00
mach-nuri.c ARM: EXYNOS: Correct framebuffer window size on Nuri board 2012-01-31 12:58:31 +09:00
mach-origen.c ARM: EXYNOS: use static declaration when it is not used in other files 2012-01-21 11:11:39 +09:00
mach-smdk4x12.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-smdkv310.c Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
mach-universal_c210.c Merge branch 'samsung/cleanup-exynos-clock' into next/soc 2012-03-20 10:07:48 +00:00
Makefile ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs 2012-03-10 22:28:09 -08:00
Makefile.boot
mct.c ARM: EXYNOS: fix cycle count for periodic mode of clock event timers 2012-03-10 07:26:59 -08:00
platsmp.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
pm.c Merge branch 'samsung/cleanup-exynos-clock' into next/soc 2012-03-20 10:07:48 +00:00
pmu.c
setup-fimc.c
setup-fimd0.c
setup-i2c0.c
setup-i2c1.c
setup-i2c2.c
setup-i2c3.c
setup-i2c4.c
setup-i2c5.c
setup-i2c6.c
setup-i2c7.c
setup-keypad.c
setup-sdhci-gpio.c
setup-spi.c ARM: EXYNOS: Modified files for SPI consolidation work 2011-12-26 16:42:15 +09:00
setup-usb-phy.c ARM: EXYNOS: Add USB OHCI device 2011-12-23 11:21:28 +09:00