diff options
author | Linus Torvalds | 2014-03-08 02:37:45 +0100 |
---|---|---|
committer | Linus Torvalds | 2014-03-08 02:37:45 +0100 |
commit | 9579f10dfdd91d5a1bc77a588b630bc945d9fb95 (patch) | |
tree | be262474a629de6dd18803162a2d3bbb857ee3df /arch/arm/include/asm/memory.h | |
parent | Merge tag 'trace-fixes-v3.14-rc5' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
parent | powerpc: Align p_dyn, p_rela and p_st symbols (diff) | |
download | kernel-qcow2-linux-9579f10dfdd91d5a1bc77a588b630bc945d9fb95.tar.gz kernel-qcow2-linux-9579f10dfdd91d5a1bc77a588b630bc945d9fb95.tar.xz kernel-qcow2-linux-9579f10dfdd91d5a1bc77a588b630bc945d9fb95.zip |
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/arm/include/asm/memory.h')
0 files changed, 0 insertions, 0 deletions