diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-21 00:40:51 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-21 00:40:51 +0900 |
| commit | 8bcee1832d23869c2cdb6886ae5210b0143256f0 (patch) | |
| tree | 9fac190248ed9ed10fe4e6f7b1b4cda8eaef7ddd /arch/arm/mach-vexpress/headsmp.S | |
| parent | 5ce2a2ddb5d75d5e2371e58011fc21351bf278cb (diff) | |
| parent | 1cf215a5b43950d1a304373037828158057ff9fc (diff) | |
| download | talos-op-linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.tar.gz talos-op-linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.zip | |
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-vexpress/headsmp.S')
| -rw-r--r-- | arch/arm/mach-vexpress/headsmp.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/headsmp.S b/arch/arm/mach-vexpress/headsmp.S index 8a78ff68e1ee..7a3f0632947c 100644 --- a/arch/arm/mach-vexpress/headsmp.S +++ b/arch/arm/mach-vexpress/headsmp.S @@ -35,5 +35,6 @@ pen: ldr r7, [r6] */ b secondary_startup + .align 1: .long . .long pen_release |
