commit | c9a52a1e66ab4d595d6c20365502b00be7f7a50b | [log] [tgz] |
---|---|---|
author | Geert Uytterhoeven <geert+renesas@glider.be> | Mon Jul 07 12:27:10 2014 +0200 |
committer | Geert Uytterhoeven <geert+renesas@glider.be> | Mon Jul 07 12:27:10 2014 +0200 |
tree | 0abe6262500502bb53d505cb49191d3ef81c91a2 | |
parent | 5d949d0e85e5502302f4de47e78c417d14d97832 [diff] | |
parent | 8a3a9dd50dd9af0fee64df1cf37d419307d4f332 [diff] |
Merge remote-tracking branch 'arm/for-next' into base Conflicts: arch/arm/mach-shmobile/headsmp.S