diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-17 04:45:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-17 04:45:15 +0200 |
| commit | de0024b60c26a899192fcb56307df7f9490fca4f (patch) | |
| tree | 1440b5ddf3259f72c21cfbf9f19d7b7606068744 /fs/nfs/nfs4client.c | |
| parent | Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmar... (diff) | |
| parent | powerpc: add a missing label in resume_kernel (diff) | |
| download | linux-de0024b60c26a899192fcb56307df7f9490fca4f.tar.xz linux-de0024b60c26a899192fcb56307df7f9490fca4f.zip | |
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
Diffstat (limited to 'fs/nfs/nfs4client.c')
0 files changed, 0 insertions, 0 deletions