From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Apr 2012 16:19:29 +0000 (-0700)
Subject: Merge git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.4-rc4~36
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bc0cf58ec7ccd09dfcd134b9a20fb4fdc4d24554;p=~emulex%2Finfiniband.git

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
---

bc0cf58ec7ccd09dfcd134b9a20fb4fdc4d24554