summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-07-26 17:54:21 +0200
committerArnd Bergmann <arnd@arndb.de>2014-07-26 17:54:21 +0200
commit944483d0330bb497549977aa9649be6b7d0ede37 (patch)
tree545d9c5498e0dbe7697b36ad50379a815b48ec1b /README
parentMerge tag 'v3.17-rockchip-smp-hotplug' of git://git.kernel.org/pub/scm/linux/... (diff)
parentMerge tag 'omap-for-v3.17/fixes-not-urgent-signed' of git://git.kernel.org/pu... (diff)
downloadlinux-944483d0330bb497549977aa9649be6b7d0ede37.tar.xz
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 'README')
0 files changed, 0 insertions, 0 deletions