From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Sep 2012 21:52:49 +0000 (+0800)
Subject: Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.6-rc6~36
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e9bd8f1624cb0f647867d6cced79cb26ef3651bf;p=linux-block.git

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

Pull CIFS fixes from Steve French.

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Fix endianness conversion
  CIFS: Fix error handling in cifs_push_mandatory_locks
---

e9bd8f1624cb0f647867d6cced79cb26ef3651bf