linux/arch/arm/mach-exynos
Arnd Bergmann 944483d033 Merge branch 'next/fixes-non-critical' into next/soc
This resolves a nontrivial conflict against a bug fix
in another branch.

Conflicts:
	arch/arm/mach-exynos/pm.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26 17:54:21 +02:00
..
2014-06-17 17:09:48 +02:00
2014-06-02 16:35:49 -07:00