diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-18 22:47:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-18 22:47:13 -0700 |
| commit | 35a21b429917baf86d7595826e7314662ec09d0a (patch) | |
| tree | b60e4451fe84fe113fbb98ef09733cd2071998bb /include/linux/timerqueue.h | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable (diff) | |
| parent | NFSv4.1: Return NFS4ERR_BADSESSION to callbacks during session resets (diff) | |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
NFSv4.1: Return NFS4ERR_BADSESSION to callbacks during session resets
NFSv4.1: Fix the callback 'highest_used_slotid' behaviour
pnfs-obj: Fix the comp_index != 0 case
pnfs-obj: Bug when we are running out of bio
nfs: add missing prefetch.h include
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions