tree 35624c1b5f89a6b4d2b9e5e0364706165f7f7dd3
parent a95251b8bac4a91a43db795a7193545dac65f4f4
parent c772aa92b6deb2857d4b39a5cc3bd3679cc5f4a6
author Linus Torvalds <torvalds@linux-foundation.org> 1354323438 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1354323438 -0800

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