diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 11:27:13 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-08-05 11:27:13 +0200 |
| commit | 7109561524dc57b95fd3f9b61547268b9b6db8ed (patch) | |
| tree | df08f565b2c616b7e68fe35cd428a8c5ba3bfcb1 /arch/arm/mach-s3c24xx/sleep-s3c2412.S | |
| parent | ARM: 8124/1: don't enter kgdb when userspace executes a kgdb break instruction (diff) | |
| parent | ARM: add comments to the early page table remap code (diff) | |
| download | linux-7109561524dc57b95fd3f9b61547268b9b6db8ed.tar.xz linux-7109561524dc57b95fd3f9b61547268b9b6db8ed.zip | |
Merge branches 'fixes' and 'misc' into for-next
Conflicts:
arch/arm/kernel/iwmmxt.S
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
Diffstat (limited to 'arch/arm/mach-s3c24xx/sleep-s3c2412.S')
| -rw-r--r-- | arch/arm/mach-s3c24xx/sleep-s3c2412.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/sleep-s3c2412.S b/arch/arm/mach-s3c24xx/sleep-s3c2412.S index 5adaceb7da13..6bf5b4d8743c 100644 --- a/arch/arm/mach-s3c24xx/sleep-s3c2412.S +++ b/arch/arm/mach-s3c24xx/sleep-s3c2412.S @@ -65,4 +65,4 @@ s3c2412_sleep_enter1: strne r9, [r3] bne s3c2412_sleep_enter1 - mov pc, r14 + ret lr |