tree 545d9c5498e0dbe7697b36ad50379a815b48ec1b
parent 03eea7cda20128f97fa281650ada69fe19194d56
parent fd9f5edf6e7e8a666f3672fd809f3289c2da388a
author Arnd Bergmann <arnd@arndb.de> 1406390061 +0200
committer Arnd Bergmann <arnd@arndb.de> 1406390061 +0200

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>