]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5c80c71 910ac68)
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Aug 2011 05:47:13 +0000 (22:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Aug 2011 05:47:13 +0000 (22:47 -0700)
commit35a21b429917baf86d7595826e7314662ec09d0a
treeb60e4451fe84fe113fbb98ef09733cd2071998bbtree
parent5c80c71b9a0ec518b4b58d2a61de01a04f4a4453commit | diff
parent910ac68a2b80c7de95bc8488734067b1bb15d583commit | 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
Ubuntu Disco kernel mirror for Proxmox VE and PMG