From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 1 Dec 2012 00:57:18 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: MMI-PSA29.97-13-9~15491
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=086486e46e4206cfa1140fb9682ad67c8a4502fb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

Pull CIFS fixes from Steve French:
 "Two low risk, small fixes, that fix cifs regressions introduced in
  3.7."

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Fix wrong buffer pointer usage in smb_set_file_info
  cifs: fix writeback race with file that is growing
---

086486e46e4206cfa1140fb9682ad67c8a4502fb