summaryrefslogtreecommitdiff
path: root/arch/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-03-07 17:37:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-03-07 17:37:45 -0800
commit9579f10dfdd91d5a1bc77a588b630bc945d9fb95 (patch)
treebe262474a629de6dd18803162a2d3bbb857ee3df /arch/Kconfig
parent721f0c126075294e66df73051cc2e1d795ef2095 (diff)
parenta5b2cf5b1af424ee3dd9e3ce6d5cea18cb927e67 (diff)
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
Diffstat (limited to 'arch/Kconfig')
0 files changed, 0 insertions, 0 deletions