diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-10 05:08:32 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-10 05:08:32 +0300 |
commit | 529a86e063e9ff625c4ff247d8aa17d8072444fb (patch) | |
tree | 4de0e0ef1ef874addbd09195c8ba7105501efaf1 /drivers/cdrom/Makefile | |
parent | ff33952e4d235efa98ce8a43416c19ddc16fb4fa (diff) | |
parent | 044215d145a7a8a60ffa8fdc859d110a795fa6ea (diff) | |
download | linux-529a86e063e9ff625c4ff247d8aa17d8072444fb.tar.xz |
Merge branch 'ppc-bundle' (bundle from Michael Ellerman)
Merge powerpc transactional memory fixes from Michael Ellerman:
"I figured I'd still send you the commits using a bundle to make sure
it works in case I need to do it again in future"
This fixes transactional memory state restore for powerpc.
* bundle'd patches from Michael Ellerman:
powerpc/tm: Fix illegal TM state in signal handler
powerpc/64s: Use emergency stack for kernel TM Bad Thing program checks
Diffstat (limited to 'drivers/cdrom/Makefile')
0 files changed, 0 insertions, 0 deletions