From: Arnd Bergmann Date: Tue, 9 Apr 2013 13:50:59 +0000 (+0200) Subject: Merge tag 'v3.9-rc3' into next/multiplatform X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=835f9c38bbb4498c3d43b7466964bdadbb1fd244;p=linux-beck.git Merge tag 'v3.9-rc3' into next/multiplatform Linux 3.9-rc3 Conflicts: arch/arm/Kconfig arch/arm/mach-spear/spear3xx.c arch/arm/plat-spear/Kconfig This is a dependency for ux500/multiplatform Signed-off-by: Arnd Bergmann --- 835f9c38bbb4498c3d43b7466964bdadbb1fd244