Merge branch 'linus' into x86/apic

Conflicts:
	arch/x86/kernel/acpi/boot.c
	arch/x86/mm/fault.c

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/arm/mach-omap2/sleep24xx.S b/arch/arm/mach-omap2/sleep24xx.S
index 43336b93b21..bf9e96105e1 100644
--- a/arch/arm/mach-omap2/sleep24xx.S
+++ b/arch/arm/mach-omap2/sleep24xx.S
@@ -93,9 +93,8 @@ ENTRY(omap24xx_cpu_suspend)
         orr     r4, r4, #0x40           @ enable self refresh on idle req
         mov     r5, #0x2000             @ set delay (DPLL relock + DLL relock)
         str     r4, [r2]                @ make it so
-        mov     r2, #0
         nop
-        mcr     p15, 0, r2, c7, c0, 4   @ wait for interrupt
+        mcr     p15, 0, r3, c7, c0, 4   @ wait for interrupt
         nop
 loop:
         subs    r5, r5, #0x1            @ awake, wait just a bit