diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-15 12:36:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-15 12:36:01 -0700 |
| commit | 17d8428e4c911f7877d8470bca7a09a4b2aa2d57 (patch) | |
| tree | f5d28b15f08b04172380d43f3a9181e2d760a047 /arch/x86/include/asm/alternative.h | |
| parent | fa758702c298c98674ec641e9252e507ddaa29be (diff) | |
| parent | fb2088ccc139ffbf1cf359216883712dab4ae43d (diff) | |
| download | blackbird-op-linux-17d8428e4c911f7877d8470bca7a09a4b2aa2d57.tar.gz blackbird-op-linux-17d8428e4c911f7877d8470bca7a09a4b2aa2d57.zip | |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
nfs: Do not allow multiple mounts on same mountpoint when using -o noac
NFS: Fix a typo in nfs_flush_multi
NFSv4: renewd needs to be able to handle the NFS4ERR_CB_PATH_DOWN error
NFSv4: The NFSv4.0 client must send RENEW calls if it holds a delegation
NFSv4: nfs4_proc_renew should be declared static
NFSv4: nfs4_proc_async_renew should use a GFP_NOFS allocation
Diffstat (limited to 'arch/x86/include/asm/alternative.h')
0 files changed, 0 insertions, 0 deletions
