Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 16 Sep 2011 20:45:16 +0000 (21:45 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 16 Sep 2011 20:45:16 +0000 (21:45 +0100)
commit4722cd7741c6404f967f7a7b8b666540b6c1663e
tree877b7d8efe1e4e4ce48416186b4f45da3a5fccac
parent1db3706b05b11abcf2673ffbed5ad43b4c90ed11
parent4fb0d2ea397ab207fdecbd88ad0e37b36ce68a62
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable

Conflicts:
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/Kconfig
arch/arm/kernel/setup.c
arch/arm/mach-exynos4/mach-universal_c210.c
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/mach-imx/mach-cpuimx35.c
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
arch/arm/mach-orion5x/dns323-setup.c
arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/mach-shmobile/board-mackerel.c
arch/arm/mach-vexpress/v2m.c