Merge branch 'devel-stable' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 23 May 2011 18:28:04 +0000 (19:28 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 23 May 2011 18:28:04 +0000 (19:28 +0100)
commit9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0
tree894bb6a3fb409c6ac5f0374f5a1f656918bc35cd
parentec19628d72cff8f80220b7cedba089074ac6a599
parentdc7ad3b3d5f1cd0a0d16c05dd3ad3898979d261e
Merge branch 'devel-stable' into for-linus

Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/compressed/head.S
arch/arm/mach-mxs/Kconfig
arch/arm/plat-mxc/time.c
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/gpio.c