From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 26 Jul 2014 15:54:21 +0000 (+0200)
Subject: Merge branch 'next/fixes-non-critical' into next/soc
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~122^2~10
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=944483d0330bb497549977aa9649be6b7d0ede37;p=pandora-kernel.git

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>
---

944483d0330bb497549977aa9649be6b7d0ede37
Reading git-diff-tree failed