From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 7 Nov 2011 17:56:22 +0000 (-0800)
Subject: Merge git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.2-rc1~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff4d7fa8c32f6ec513fb792c060809ec82d53ea4;p=profile%2Fivi%2Fkernel-x86-ivi.git

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
---

ff4d7fa8c32f6ec513fb792c060809ec82d53ea4