diff options
| author |  Arnd Bergmann <arnd@arndb.de>
| 2014-07-26 17:54:21 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de>
| 2014-07-26 17:54:21 +0200 |
| commit | 944483d0330bb497549977aa9649be6b7d0ede37 (patch) | |
| tree | 545d9c5498e0dbe7697b36ad50379a815b48ec1b /arch/arm/plat-samsung | |
| parent | Merge tag 'v3.17-rockchip-smp-hotplug' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | Merge tag 'omap-for-v3.17/fixes-not-urgent-signed' of git://git.kernel.org/pu... (diff) | |
| download | linux-944483d0330bb497549977aa9649be6b7d0ede37.tar.gz linux-944483d0330bb497549977aa9649be6b7d0ede37.tar.bz2 linux-944483d0330bb497549977aa9649be6b7d0ede37.zip | |
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>
Diffstat (limited to 'arch/arm/plat-samsung')
0 files changed, 0 insertions, 0 deletions