diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-20 10:40:51 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-20 10:40:51 -0500 |
| commit | 8bcee1832d23869c2cdb6886ae5210b0143256f0 (patch) | |
| tree | 9fac190248ed9ed10fe4e6f7b1b4cda8eaef7ddd /arch/arm/mach-shmobile/board-ag5evm.c | |
| 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>
Diffstat (limited to 'arch/arm/mach-shmobile/board-ag5evm.c')
0 files changed, 0 insertions, 0 deletions