Merge git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2011 17:56:22 +0000 (09:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Nov 2011 17:56:22 +0000 (09:56 -0800)
commitff4d7fa8c32f6ec513fb792c060809ec82d53ea4
tree2b04ad419ff934fd640a97ac8e9df1abdd1e503c
parente0d65113a70f1dc514e625cc4e7a7485a4bf72df
parenta88b470773bc5b640292d8be7b8e7e1011a86639
Merge git://git.samba.org/sfrench/cifs-2.6

* git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Cleanup byte-range locking code style
  CIFS: Simplify setlk error handling for mandatory locking