]> 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)
commitf7bf8b21340f593698b1f4dc34ec3178fbd62594
tree2b04ad419ff934fd640a97ac8e9df1abdd1e503c
parent5ea9ea9a9df5b926cde559b473063652ec4dd0c3
parent8205cceec95d421f7719e9ef9949bba8bdd0bb88
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