summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2013-09-27 08:52:45 +0100
committerJon Medhurst <tixy@linaro.org>2013-09-27 08:52:45 +0100
commit0d59d95725af5fecbe17b01efcfadfd84bae5fe2 (patch)
tree3c51ad5bba286fe80ef55d00bb681a9f4a158178 /CREDITS
parentf684be0f575e0972375d806f52dcc56aede5c7c1 (diff)
parentfcc525ff436c7df38d39c2ccef135a53460b4d1a (diff)
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpresstracking-integration-linaro-vexpress-ll-20131008.0tracking-integration-linaro-vexpress-ll-20131003.0
Conflicts: linaro/configs/vexpress64.conf
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions