diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-07-17 12:01:50 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-07-17 12:01:50 +0100 |
| commit | 95106c3b6742a45828bd675ca55e3e378d6d3071 (patch) | |
| tree | b61b339f9a407443bce35d3685320c812ba6c239 /include/linux/vexpress.h | |
| parent | fcd1e5ad6653a951c1b0e945197bcf79a51e1e65 (diff) | |
| parent | 4311d5a4b599317bc321b1d8b9c0d1f4e49e7df5 (diff) | |
Merge branch 'tracking-armlt-cci' into lsk-3.10-vexpress
Conflicts:
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
Diffstat (limited to 'include/linux/vexpress.h')
0 files changed, 0 insertions, 0 deletions