Merge git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Apr 2012 16:19:29 +0000 (09:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 17 Apr 2012 16:19:29 +0000 (09:19 -0700)
commitbc0cf58ec7ccd09dfcd134b9a20fb4fdc4d24554
tree28d88cc22b48ce9decd6ce8d1c36d8f83d7a440b
parent4643b05662966a615845803c7bc89c5a5e77d6d5
parentbfa890a3cdeed29eef53d54cd7f80cec0fd46b11
Merge git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French.

* git://git.samba.org/sfrench/cifs-2.6:
  Fix number parsing in cifs_parse_mount_options
  Cleanup handling of NULL value passed for a mount option