kevin/linux
1
Fork 0
Code
237c78beb8
linux/arch/arm/mach-s3c64xx
History
Arnd Bergmann 237c78beb8 Merge branch 'depends/rmk/for-linus' into samsung/dt 
Conflicts:
	arch/arm/mach-exynos/Makefile
	arch/arm/mach-exynos/cpu.c -> common.c
	arch/arm/mach-exynos/include/mach/entry-macro.S
	arch/arm/mach-exynos/init.c -> common.c
	arch/arm/mach-s5p64x0/init.c -> common.c
	arch/arm/mach-s5pv210/init.c -> common.c

Multiple files were moved into common.c files in the rmk/for-linus
branch, so this moves over the samsung/dt changes to the new
files.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-07 12:42:17 +00:00
..
include/mach Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
clock.c Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
common.c ARM: 7266/1: restart: S3C64XX: use new restart hook 2012-01-05 12:57:18 +00:00
common.h ARM: 7266/1: restart: S3C64XX: use new restart hook 2012-01-05 12:57:18 +00:00
dev-audio.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
dev-spi.c ARM: S3C64XX: Add linux/export.h to dev-spi.c 2011-12-02 14:17:54 +09:00
dev-uart.c ARM: SAMSUNG: Remove uart irq handling from plaform code 2011-08-23 10:48:31 -07:00
dma.c Merge branch 'next/topic-dma-samsung' into next-samsung-devel 2011-10-04 18:57:38 +09:00
irq-pm.c ARM / Samsung: Use struct syscore_ops for "core" power management 2011-04-24 19:16:10 +02:00
Kconfig ARM: S3C64XX: Use module identification for Cragganmore system builds 2011-09-19 16:32:36 +09:00
mach-anw6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-crag6410-module.c ARM: SAMSUNG: inclusion export.h instead of module.h 2011-11-17 01:14:38 +09:00
mach-crag6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-hmt.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-mini6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-ncp.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-real6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq5.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq7.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq.c ARM: 7245/1: S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch] 2011-12-23 19:07:55 +00:00
mach-smartq.h
mach-smdk6400.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smdk6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
Makefile ARM: 7245/1: S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch] 2011-12-23 19:07:55 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pm.c ARM: S3C64XX: Save/restore S3C64XX_MODEM_MIFPCON on suspend/resume 2011-09-19 16:38:05 +09:00
s3c6400.c Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD 2012-01-05 12:55:03 +00:00
s3c6410.c ARM: 7245/1: S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch] 2011-12-23 19:07:55 +00:00
setup-fb-24bpp.c ARM: S3C64XX: Remove extern from definition of framebuffer setup call 2011-12-02 14:17:36 +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