Merge branch 'ux500/soc' into ux500/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Mar 2012 19:13:58 +0000 (19:13 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Mar 2012 19:13:58 +0000 (19:13 +0000)
commitf56b71f5d5a3944acdcb0e5e1739574d95ddf61a
tree2cdfad1895d7638489a74af22bd6cb760f95c848
parentc0206e228e34d8b414fcc63db45b831843adea06
parent3510ec672319e09fe43bd623b19fcf539c0bd1fa
Merge branch 'ux500/soc' into ux500/dt
arch/arm/mach-ux500/cpu.c
arch/arm/mach-ux500/include/mach/setup.h