| commit | 3acb4d46115e3b5071b62eacee1bda4def0430a1 | [log] [tgz] |
|---|---|---|
| author | Jon Medhurst <tixy@linaro.org> | Fri Jan 09 12:36:58 2015 +0000 |
| committer | Jon Medhurst <tixy@linaro.org> | Fri Jan 09 12:36:58 2015 +0000 |
| tree | 77fb83e6c6906a4938302a8fa3a2f40e3bc5f6bc | |
| parent | c5896c61dbc248048ac5fd5a1608d7f9866d2fbc [diff] | |
| parent | 5b4149b3f779057af02ecf0731894e8a66578e2f [diff] |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpress64 Conflicts: linaro/configs/vexpress64.conf