renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 21:24:00 +08:00
Code
237c78beb8
linux-next/arch/arm/mach-s5p64x0
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 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
clock-s5p6440.c Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
clock-s5p6450.c Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
clock.c ARM: 7246/1: S5P64X0: introduce arch/arm/mach-s5p64x0/common.[ch] 2011-12-23 19:11:05 +00:00
common.c Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
common.h ARM: 7250/1: restart: S5P64X0: use new restart hook 2012-01-05 12:57:19 +00:00
dev-audio.c ARM: S5P64X0: Segregate audio devices 2010-12-30 08:24:27 +09:00
dev-spi.c ARM: S5P64X0: Use soc_is_s5p64x0() to distinguish cpu at runtime 2011-08-22 07:14:08 +09:00
dma.c ARM: S5P64x0: Modify platform data for pl330 driver 2011-12-23 10:07:07 +09:00
gpiolib.c gpio/s5p64x0: move gpio driver into drivers/gpio/ 2011-09-21 10:52:39 +09:00
irq-pm.c ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
Kconfig ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
mach-smdk6440.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smdk6450.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
Makefile ARM: 7246/1: S5P64X0: introduce arch/arm/mach-s5p64x0/common.[ch] 2011-12-23 19:11:05 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pm.c ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
setup-fb-24bpp.c ARM: S5P64X0: Add GPIO setup for LCD 2011-10-04 19:00:53 +09:00
setup-i2c0.c ARM: S5P64X0: Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:20 +09:00
setup-i2c1.c ARM: S5P64X0: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:53 +09:00