Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Apr 2013 02:45:15 +0000 (19:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Apr 2013 02:45:15 +0000 (19:45 -0700)
commitde0024b60c26a899192fcb56307df7f9490fca4f
tree1440b5ddf3259f72c21cfbf9f19d7b7606068744
parentc208278c5c6ec815acfe4ea4701302edf8fe8a21
parentd8b92292408831d86ff7b781e66bf79301934b99
Merge tag 'for-linus' of git://git./linux/kernel/git/sfr/next-fixes

Pull powerpc fixes from Stephen Rothwell:
 "Three regresions in the PowerPC code.  One from v3.7 the others from
  this merge window."

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes:
  powerpc: add a missing label in resume_kernel
  powerpc: Fix audit crash due to save/restore PPR changes
  powerpc: fix compiling CONFIG_PPC_TRANSACTIONAL_MEM when CONFIG_ALTIVEC=n