Merge branch 'tracking-armlt-tc2-psci' into lsk-3.10-vexpress
authorJon Medhurst <tixy@linaro.org>
Wed, 17 Jul 2013 11:02:21 +0000 (12:02 +0100)
committerJon Medhurst <tixy@linaro.org>
Wed, 17 Jul 2013 11:02:21 +0000 (12:02 +0100)
commitb3792f58beb849951acc7d2da15b48c8dd593fc4
tree60122eb4c0336cb340ecf07195ff0a2d137077d4
parent3138d553f9181ecdaae3a7cfce6e8e1270f7cdcc
parent521caf641e76b48016e25b66e37799a9333ede39
Merge branch 'tracking-armlt-tc2-psci' into lsk-3.10-vexpress
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
arch/arm/mach-vexpress/Makefile