From: Linus Torvalds Date: Sat, 8 Mar 2014 01:37:45 +0000 (-0800) Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc X-Git-Tag: v3.14-rc6~19 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=9579f10dfdd91d5a1bc77a588b630bc945d9fb95;p=karo-tx-linux.git Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc Pull power fixes from Ben Herrenschmidt: "Here are a couple of powerpc fixes for 3.14. One is (another!) nasty TM problem, we can crash the kernel by forking inside a transaction. The other one is a simple fix for an alignment issue which can hurt in LE mode" * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Align p_dyn, p_rela and p_st symbols powerpc/tm: Fix crash when forking inside a transaction --- 9579f10dfdd91d5a1bc77a588b630bc945d9fb95