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)
commit0d0ffa94e0ea0aab3dcb75366806d064f05fdc45
tree43e74553fa29f2c303c3ba03395060aece1785d1
parent9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a
parent2bdd424f26be1c98b6e3d9acfffb5559c131c888
Merge branch 'for-rmk/virt/psci' into for-arm-soc/virt/mach
arch/arm/Kconfig