Merge branch 'for-rmk/virt/psci' into for-arm-soc/virt/mach
authorWill Deacon <will.deacon@arm.com>
Fri, 1 Feb 2013 10:29:16 +0000 (10:29 +0000)
committerWill Deacon <will.deacon@arm.com>
Fri, 1 Feb 2013 10:29:16 +0000 (10:29 +0000)
1  2 
arch/arm/Kconfig

Simple merge