This resolves a nontrivial conflict against a bug fix
in another branch.

Conflicts:
	arch/arm/mach-exynos/pm.c
Signed-off-by: NArnd Bergmann <arnd@arndb.de>