| commit | 8bcee1832d23869c2cdb6886ae5210b0143256f0 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Tue Dec 21 00:40:51 2010 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Tue Dec 21 00:40:51 2010 +0900 |
| tree | 9fac190248ed9ed10fe4e6f7b1b4cda8eaef7ddd | |
| parent | 5ce2a2ddb5d75d5e2371e58011fc21351bf278cb [diff] | |
| parent | 1cf215a5b43950d1a304373037828158057ff9fc [diff] |
Merge branch 'rmobile/urgent' into rmobile-latest Conflicts: arch/arm/mach-shmobile/include/mach/entry-macro.S Signed-off-by: Paul Mundt <lethal@linux-sh.org>