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/plat

Merge branch 'depends/rmk/devel-stable' into next/board

2011-11-01 00:11:41 +01:00

clock.c

switch assorted clock drivers to debugfs_remove_recursive()

2011-07-20 20:47:51 -04:00

Kconfig

ARM: 6013/1: ST SPEAr: Added source files for SPEAr platform

2010-04-14 11:31:59 +01:00

Makefile

ARM: 6678/1: SPEAr: update padmux code

2011-03-09 09:49:44 +00:00

padmux.c

arm: plat-spear: fix typo in kerneldoc

2010-07-19 11:04:14 +02:00

shirq.c

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

time.c

clocksource: convert SPEAr platforms 16-bit up counting clocksource

2011-05-23 18:04:52 +01:00