Merge branch 'tracking-armlt-cci' into lsk-3.10-vexpress
authorJon Medhurst <tixy@linaro.org>
Wed, 17 Jul 2013 11:01:50 +0000 (12:01 +0100)
committerJon Medhurst <tixy@linaro.org>
Wed, 17 Jul 2013 11:01:50 +0000 (12:01 +0100)
commit95106c3b6742a45828bd675ca55e3e378d6d3071
treeb61b339f9a407443bce35d3685320c812ba6c239
parentfcd1e5ad6653a951c1b0e945197bcf79a51e1e65
parent4311d5a4b599317bc321b1d8b9c0d1f4e49e7df5
Merge branch 'tracking-armlt-cci' into lsk-3.10-vexpress

Conflicts:
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts