diff options
| author | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:06:45 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2013-05-09 14:06:45 +0100 |
| commit | f1ab999e4776b5cf0acd9d466a61c14c61783cd8 (patch) | |
| tree | 814ba3c29089cf71cc67704376a247d73c4d8ff3 /arch/arm/Kconfig | |
| parent | 8183e91e9471c776a63528ba446919338e827d3f (diff) | |
| parent | 8cce675a5d4031ff1adf6d9a49de9c4542afcbaf (diff) | |
Merge branch 'tracking-armlt-tc2-dt' into lsk-3.9-vexpress
Conflicts:
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
Diffstat (limited to 'arch/arm/Kconfig')
0 files changed, 0 insertions, 0 deletions