The following changes since commit 239a14a340ad4a81cfff4075625382d7f78f5258:
(Rebased against git://git.linaro.org/kernel/linux-linaro-2.6.38.git)
Merge commit 'v2.6.38-rc6' into linaro-2.6.38 (2011-02-22 22:26:28 -0500)
are available in the git repository at:
git://git.linaro.org/people/dmart/linux-2.6-arm.git for-linaro-2.6.38/dirty/arm/omap-thumb2+merged
Dave Martin (9): ARM: omap4: Provide do_wfi() for Thumb-2 ARM: omap4: Convert END() to ENDPROC() for correct linkage with CONFIG_THUMB2_KERNEL ARM: omap3: Remove hand-encoded SMC instructions ARM: omap3: Thumb-2 compatibility for sram34xx.S ARM: omap3: Thumb-2 compatibility for sleep34xx.S ARM: Thumb-2: Symbol manipulation macros for function body copying ARM: Add local symbols in relocate_kernel.S to work around gas bugs ARM: omap3: Work around assembler errors in sleep34xx.S ARM: Thumb-2: Reflect ARM/Thumb-2 configuration in module vermagic
Jean Pihet (2): omap: use fncpy to copy the PM code functions to SRAM OMAP: fix fncpy API call
arch/arm/include/asm/fncpy.h | 94 +++++++++++++++++++++++ arch/arm/include/asm/module.h | 8 ++ arch/arm/kernel/relocate_kernel.S | 12 ++- arch/arm/mach-omap1/pm.h | 6 +- arch/arm/mach-omap1/sleep.S | 3 + arch/arm/mach-omap1/sram.S | 1 + arch/arm/mach-omap2/include/mach/omap4-common.h | 4 + arch/arm/mach-omap2/omap-headsmp.S | 2 +- arch/arm/mach-omap2/omap44xx-smc.S | 8 +- arch/arm/mach-omap2/pm.h | 2 +- arch/arm/mach-omap2/sleep24xx.S | 2 + arch/arm/mach-omap2/sleep34xx.S | 71 ++++++++++++++---- arch/arm/mach-omap2/sram242x.S | 3 + arch/arm/mach-omap2/sram243x.S | 3 + arch/arm/mach-omap2/sram34xx.S | 37 +++++++-- arch/arm/plat-omap/include/plat/sram.h | 14 +++- arch/arm/plat-omap/sram.c | 14 ++- 17 files changed, 243 insertions(+), 41 deletions(-) create mode 100644 arch/arm/include/asm/fncpy.h