From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Aug 2011 05:47:13 +0000 (-0700)
Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
X-Git-Tag: Ubuntu-5.0.0-8.9~17843
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=35a21b429917baf86d7595826e7314662ec09d0a;p=mirror_ubuntu-disco-kernel.git

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
---

35a21b429917baf86d7595826e7314662ec09d0a