| commit | 9dd7242ca88eeb359646d8af1234b4b08aaa02a3 | [log] [tgz] |
|---|---|---|
| author | Jon Medhurst <tixy@linaro.org> | Thu Jul 23 18:37:20 2015 +0100 |
| committer | Jon Medhurst <tixy@linaro.org> | Thu Jul 23 18:37:20 2015 +0100 |
| tree | 89820fb57baf6340df4f6d232375fc4342e04fa3 | |
| parent | 7a6eed4318c02f3a8fd4e231b6a46c1123565a74 [diff] | |
| parent | ca4416de6d01b9a8d9b0b31b3130ecfcdb1707bd [diff] |
Merge branch 'tracking-armlt-juno-pci' into integration-linaro-vexpress Conflicts: linaro/configs/vexpress64.conf