commit | f011a08c804d50eeff4abf2d308cdce492f015aa | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 08 16:10:43 2013 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 08 16:10:43 2013 -0700 |
tree | 6be5b5c702e042b4fbdaf3a85d3ab1f9c18d9ce9 | |
parent | 79e5f05edcbf85825d19eb8a425cd6c36c6c66f1 [diff] | |
parent | 9fb2640159f9d4f5a2a9d60e490482d4cbecafdb [diff] |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes Pull powerpc bugfix from Stephen Rothwell: "A single BUG_ON fix for a condition that could happen for machines with certain hardware installed." * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes: powerpc: pSeries_lpar_hpte_remove fails from Adjunct partition being performed before the ANDCOND test