Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jul 2011 21:28:01 +0000 (14:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jul 2011 21:28:01 +0000 (14:28 -0700)
commit2bafc7a275436da4a1ece4ecfcbacb82a0560efb
tree097f820c6cad0a437255f0207e8ac6befd9fac76
parent57a6fa9acd6b4a479a6ede4d6d2258f04afd3a6f
parent2cebaa58b7de775386732bbd6cd11c3f5b73faf0
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  CIFS: Fix wrong length in cifs_iovec_read