git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream
[pandora-kernel.git]
/
arch
/
arm
/
mach-vexpress
/
headsmp.S
diff --git
a/arch/arm/mach-vexpress/headsmp.S
b/arch/arm/mach-vexpress/headsmp.S
index
8a78ff6
..
7a3f063
100644
(file)
--- 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