tree 28d88cc22b48ce9decd6ce8d1c36d8f83d7a440b
parent 4643b05662966a615845803c7bc89c5a5e77d6d5
parent bfa890a3cdeed29eef53d54cd7f80cec0fd46b11
author Linus Torvalds <torvalds@linux-foundation.org> 1334679569 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1334679569 -0700

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