Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Apr 2013 23:10:43 +0000 (16:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Apr 2013 23:10:43 +0000 (16:10 -0700)
commitf011a08c804d50eeff4abf2d308cdce492f015aa
tree6be5b5c702e042b4fbdaf3a85d3ab1f9c18d9ce9
parent79e5f05edcbf85825d19eb8a425cd6c36c6c66f1
parent9fb2640159f9d4f5a2a9d60e490482d4cbecafdb
Merge tag 'for-linus' of git://git./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