Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Nov 2011 23:54:36 +0000 (16:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Nov 2011 23:54:36 +0000 (16:54 -0700)
commit06ef93e1b8405acac6ec900564e3ad1a8e3a72b2
treeb4077ce7af0e66d2629c86f0f2653bdf087ef1f7
parentf7e801172c53c4dc48b1f888a72eae069be6333a
parentfc0d14fe2d6403eb21202fd0c1cf67cd2c85ca67
Merge branch 'for-3.2' of git://linux-nfs.org/~bfields/linux

* 'for-3.2' of git://linux-nfs.org/~bfields/linux:
  nfsd4: typo logical vs bitwise negate in nfsd4_decode_share_access