| commit | de0024b60c26a899192fcb56307df7f9490fca4f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 16 19:45:15 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 16 19:45:15 2013 -0700 |
| tree | 1440b5ddf3259f72c21cfbf9f19d7b7606068744 | |
| parent | c208278c5c6ec815acfe4ea4701302edf8fe8a21 [diff] | |
| parent | d8b92292408831d86ff7b781e66bf79301934b99 [diff] |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/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