commit 127aa93066261c2b8f03cb38e7165de8cd71736e
author Linus Torvalds <torvalds@linux-foundation.org> Mon Jan 07 13:21:55 2013 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Jan 07 13:21:55 2013 -0800
tree 4f97fcd50878a973fcd7a7d7d2af1f3e4ac05408
parent d287b8750e47c1702dab0e37ac11012bb751ece0
parent 63b7d3a41ccadef971a4ffbe6662119d4275ebf9

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French:
 "Misc small cifs fixes"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Don't let read only caching for mandatory byte-range locked files
  CIFS: Fix write after setting a read lock for read oplock files
  Revert "CIFS: Fix write after setting a read lock for read oplock files"
  cifs: adjust sequence number downward after signing NT_CANCEL request
  cifs: move check for NULL socket into smb_send_rqst