Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2010 23:26:21 +0000 (16:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 27 Apr 2010 23:26:21 +0000 (16:26 -0700)
commit11e39d993dc693e0bfc5521d367b2494cb3bcd38
treeb6e418811a47c0a92ed6f386360f07c73b8f3b87
parent03449cd9eaa4fa3a7faa4a59474bafe2e90bd143
parent2bc3c1179c781b359d4f2f3439cb3df72afc17fc
Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.34' of git://linux-nfs.org/~bfields/linux:
  nfsd4: bug in read_buf