Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Apr 2011 03:38:50 +0000 (20:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 26 Apr 2011 03:38:50 +0000 (20:38 -0700)
commitf727a938ce1c92d7693e0a66cee2295f2f9ca6d3
tree28d3467e4e86294f41b017f8a6e54b8b16dbb6b4
parentcd2e49e90f1cae7726c9a2c54488d881d7f1cd1c
parent4906e50b37e6f6c264e7ee4237343eb2b7f8d16d
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 memory over bound bug in cifs_parse_mount_options