diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-08 19:15:26 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-08 19:15:29 (GMT) |
| commit | 8e9255e6a2141e050d51bc4d96dbef494a87d653 (patch) | |
| tree | f190b142830153eaab05555a93c4f71a144ba3d4 /arch/arm/mach-realview/headsmp.S | |
| parent | 5091faa449ee0b7d73bc296a93bca9540fc51d0a (diff) | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) | |
| download | linux-8e9255e6a2141e050d51bc4d96dbef494a87d653.tar.xz | |
Merge branch 'linus' into sched/core
Merge reason: we want to queue up dependent cleanup
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-realview/headsmp.S')
| -rw-r--r-- | arch/arm/mach-realview/headsmp.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/headsmp.S b/arch/arm/mach-realview/headsmp.S index 4075473..b34be45 100644 --- a/arch/arm/mach-realview/headsmp.S +++ b/arch/arm/mach-realview/headsmp.S @@ -35,5 +35,6 @@ pen: ldr r7, [r6] */ b secondary_startup + .align 1: .long . .long pen_release |