Merge branch 'next/fixes-non-critical' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Sat, 26 Jul 2014 15:54:21 +0000 (17:54 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 26 Jul 2014 15:54:21 +0000 (17:54 +0200)
commit944483d0330bb497549977aa9649be6b7d0ede37
tree545d9c5498e0dbe7697b36ad50379a815b48ec1b
parent03eea7cda20128f97fa281650ada69fe19194d56
parentfd9f5edf6e7e8a666f3672fd809f3289c2da388a
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>
MAINTAINERS
arch/arm/boot/dts/omap5.dtsi
arch/arm/mach-exynos/platsmp.c
arch/arm/mach-exynos/pm.c