summaryrefslogtreecommitdiff
path: root/HisiPkg
diff options
context:
space:
mode:
authorLeif Lindholm <leif.lindholm@linaro.org>2014-10-03 17:18:58 +0100
committerLeif Lindholm <leif.lindholm@linaro.org>2014-10-03 17:18:58 +0100
commit8725d97537a51f7a59510f78e3503c2ca3bdb59b (patch)
tree03e76ee792fbed62daa05325dc07243773102b12 /HisiPkg
parent08a774815034162bac84807c6b62eef6e3dba978 (diff)
parent160ce34a0053f0da424a88e798a3cafd0c6dd46e (diff)
Merge remote-tracking branch 'rmt-1/linaro-topic-leg' into release-preplinaro-edk2-2014.10-a2
Conflicts: MdeModulePkg/MdeModulePkg.dsc
Diffstat (limited to 'HisiPkg')
0 files changed, 0 insertions, 0 deletions