| commit | 0ee4d17c73cc7790746ee31ed806296548667e9a | [log] [tgz] |
|---|---|---|
| author | Alex Shi <alex.shi@linaro.org> | Thu Jul 17 15:03:21 2014 +0800 |
| committer | Alex Shi <alex.shi@linaro.org> | Thu Jul 17 15:03:21 2014 +0800 |
| tree | 2ec9fbf29b9ef75dd6096b0b12b6360fb2ee5f63 | |
| parent | 9f568f90b531fabe1b3a5a4c21ec9efbc7d8702a [diff] | |
| parent | 11afcddc417f23c61f36ab918a8d1b2b0df2e5ed [diff] |
Merge branch 'vexp-tc2-psci' into vexpress Conflicts: arch/arm/mach-vexpress/Makefile