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)
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  CIFS: Fix wrong length in cifs_iovec_read


Trivial merge