Merge branch 'tracking-armlt-tc2-pm' into lsk-3.10-vexpress
authorJon Medhurst <tixy@linaro.org>
Wed, 17 Jul 2013 11:02:16 +0000 (12:02 +0100)
committerJon Medhurst <tixy@linaro.org>
Wed, 17 Jul 2013 11:02:16 +0000 (12:02 +0100)
commit3138d553f9181ecdaae3a7cfce6e8e1270f7cdcc
tree3c2b654751fed47261fa77fb2571e0c7897bbfce
parent08f87fd1f8d4c4bb7bc2473e63e01841997575a0
parentdd94c6f646873c2f16b70e1cc82451fe1c2a83c6
Merge branch 'tracking-armlt-tc2-pm' into lsk-3.10-vexpress

Conflicts:
arch/arm/mach-vexpress/Makefile
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
arch/arm/kernel/setup.c
arch/arm/mach-vexpress/Kconfig
arch/arm/mach-vexpress/Makefile