| commit | 944483d0330bb497549977aa9649be6b7d0ede37 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Sat Jul 26 17:54:21 2014 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Sat Jul 26 17:54:21 2014 +0200 |
| tree | 545d9c5498e0dbe7697b36ad50379a815b48ec1b | |
| parent | 03eea7cda20128f97fa281650ada69fe19194d56 [diff] | |
| parent | fd9f5edf6e7e8a666f3672fd809f3289c2da388a [diff] |
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>