Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Apr 2014 00:52:39 +0000 (17:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 Apr 2014 00:52:39 +0000 (17:52 -0700)
commit6e66d5dab5d530a368314eb631201a02aabb075d
tree9a815cd1951ccc75600974eddab952c51687e79a
parent25bfe4f5f138e07272f98615c305b6f7e56389e2
parent1f80c0cc39e587edd06a36b43ba3a3b09d4ac428
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fixes from Steve French:
 "A set of 5 small cifs fixes"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cif: fix dead code
  cifs: fix error handling cifs_user_readv
  fs: cifs: remove unused variable.
  Return correct error on query of xattr on file with empty xattrs
  cifs: Wait for writebacks to complete before attempting write.