diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 11:31:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 11:31:56 -0800 |
| commit | 822a5d313197c059924d394e6851be3cb312caa7 (patch) | |
| tree | 7f93e12fc7f204f3ef6856e4912f2c5d0856ffdd /block/blk-cgroup.h | |
| parent | 929e8d4a888cd15df486e5964c8e2021581a8a0f (diff) | |
| parent | 6c52961743f38747401b47127b82159ab6d8a7a4 (diff) | |
| download | op-kernel-dev-822a5d313197c059924d394e6851be3cb312caa7.zip op-kernel-dev-822a5d313197c059924d394e6851be3cb312caa7.tar.gz | |
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: Fix a regression in nfs_file_llseek()
NFSv4: Do not accept delegated opens when a delegation recall is in effect
NFSv4: Ensure correct locking when accessing the 'lock_states' list
NFSv4.1: Ensure that we handle _all_ SEQUENCE status bits.
NFSv4: Don't error if we handled it in nfs4_recovery_handle_error
SUNRPC: Ensure we always bump the backlog queue in xprt_free_slot
SUNRPC: Fix the execution time statistics in the face of RPC restarts
Diffstat (limited to 'block/blk-cgroup.h')
0 files changed, 0 insertions, 0 deletions
