]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit965bc51891363c4eaf0923916ea1cb4d45a0d7b4
tree2b04ad419ff934fd640a97ac8e9df1abdd1e503c
parentab0bcb93c1efea2929b776352902ece1c3fc6726
parentba73cb0a89d02a6e0da3fa9cc9a761d856d0606b
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