commit | 08ce61329b063d1ad0e96a19c4b4276b8e2abdfe | [log] [tgz] |
---|---|---|
author | Jon Medhurst <tixy@linaro.org> | Wed Oct 21 12:38:15 2015 +0100 |
committer | Jon Medhurst <tixy@linaro.org> | Wed Oct 21 12:38:15 2015 +0100 |
tree | 16567ec295d96cfe49ddfdbd532fffe59ae53c97 | |
parent | 1bbef56b890675daf7afa24bd04538d5f9d76083 [diff] | |
parent | 50d0303deedfd70dbf9e190c47ffb113078d26c1 [diff] |
Merge branch 'tracking-armlt-juno-pci' into integration-linaro-vexpress Conflicts: linaro/configs/vexpress64.conf