tree b4077ce7af0e66d2629c86f0f2653bdf087ef1f7
parent f7e801172c53c4dc48b1f888a72eae069be6333a
parent fc0d14fe2d6403eb21202fd0c1cf67cd2c85ca67
author Linus Torvalds <torvalds@linux-foundation.org> 1320278076 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1320278076 -0700

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