1
linux/arch/arm/mach-s5p64x0
Arnd Bergmann a7fadac10f Merge branch 'depends/rmk/devel-stable' into next/board
The exynos4 updates conflict with code from the arm devel-stable branch
and new boards need to set atag_offset in place of boot_param.

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-exynos4/include/mach/entry-macro.S
	arch/arm/mach-exynos4/mach-smdkc210.c
	arch/arm/mach-exynos4/mach-smdkv310.c
	arch/arm/mach-exynos4/mct.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2011-11-01 00:11:41 +01:00
..
include/mach Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00
clock-s5p6440.c ARM: S5P64X0: Add clkdev support 2011-07-20 19:11:30 +09:00
clock-s5p6450.c ARM: S5P64X0: Add clkdev support 2011-07-20 19:11:30 +09:00
clock.c ARM: S5P: Reduce duplicated EPLL control codes 2010-10-25 16:05:56 +09:00
cpu.c ARM: mach-s5p64x0: Setup consistent dma size at boot time 2011-08-22 12:00:10 +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: Use soc_is_s5p64x0() to distinguish cpu at runtime 2011-08-22 07:14:08 +09:00
gpiolib.c ARM: S5P64X0: Use soc_is_s5p64x0() to distinguish cpu at runtime 2011-08-22 07:14:08 +09:00
init.c
irq-eint.c Merge branch 'next/topic-cpuid-rev' into next/topic-add-exynos4212 2011-09-16 16:38:43 +09:00
Kconfig ARM: S5P64X0: Add PWM backlight support on SMDK6450 2011-07-21 02:10:46 +09:00
mach-smdk6440.c ARM: mach-s5p64x0: convert boot_params to atag_offset 2011-08-21 17:15:10 -04:00
mach-smdk6450.c ARM: mach-s5p64x0: convert boot_params to atag_offset 2011-08-21 17:15:10 -04:00
Makefile ARM: S5P64X0: External Interrupt Support 2011-07-21 17:29:29 +09:00
Makefile.boot
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