]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
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)
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


Trivial merge