Merge commit 'ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893' into tf700/fix/suspend-lockup

Conflicts:
	arch/arm/mach-imx/mach-cpuimx27.c Use theirs
	arch/arm/mach-msm/board-msm7x30.c Use theirs
	arch/arm/mach-tegra/board-harmony.c Deleted
	arch/arm/mach-tegra/board-paz00.c Deleted
	arch/arm/mach-tegra/board-seaboard.c Deleted
	arch/arm/mach-tegra/board-trimslice.c Deleted
Merge commit '1db3706b05b11abcf2673ffbed5ad43b4c90ed11' into tf700/fix/suspend-lockup
Merge commit 'f70cac8d9c7125f83048f8b3d1c60f5a041a165c' into tf700/fix/suspend-lockup

Conflicts:
	arch/arm/mach-imx/mach-cpuimx27.c Use theirs
Merge commit 'f5fa68d9674156ddaafa12a058ccc93c8866d5f9' into tf700/fix/suspend-lockup
Remove ARCH_HAS_SUSPEND_PAGETABLE option and all its usages.

This isn't supported in the mainline kernel.
Ignore commit 'e8ce0eb5e2254b85415e4b58e73f24a5d13846a1'
Ignore commit 'de8e71ca4f2e17329f6718ae88d5c8336cb249ee'
Merge commit '1aede681ac159884c77817d33230eed9185b6f6c' into tf700/fix/suspend-lockup
Merge commit '62b2d07c0ea9db40a1787d2d0ab49f03c3e0613c' into tf700/fix/suspend-lockup

Conflicts:
	arch/arm/kernel/sleep.S Merge changes
	arch/arm/kernel/suspend.c Ignore changes
Ignore commit 'abda1bd5f4e04054ce083c298fcd68a743e9df03'
Ignore commit '8e6f83bbdf770014c070c5a41c8e89617cb2a66b'
Move cpu_pm to kernel/ in anticipation of its addition to the mainline
Merge commit '1fb9026344ea9ecc7c5860240104109112384a61' into tf700/fix/suspend-lockup

Conflicts:
	include/linux/cpu_pm.h Merge changes
	kernel/Makefile Merge changes
	kernel/cpu_pm.c Merge changes
	kernel/power/Kconfig Merge changes
Merge commit '254056f3b12563c11e6dbcfad2fbfce20a4f3302' into tf700/fix/suspend-lockup

Conflicts:
	arch/arm/common/gic.c Merge changes
	arch/arm/include/asm/hardware/gic.h Merge changes
Several formatting changes in arm/vfpmodule
arm/vfp: extract vfp_force_reload()
arm/vfp: extract vfp_state_in_hw()
arm/vfp: several minor changes
Merge commit '746a9d1963f1c7a3cd22662065d7dcd3d93ee62e' into tf700/fix/suspend-lockup

Conflicts:
	arch/arm/vfp/vfpmodule.c Merge changes
Ignore commit '9c12845ee49716209cb2b087c0b47c3e37096bde'

Already in tf700/fix/suspend-lockup.