projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4643b05 bfa890a)
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)
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


Trivial merge
John Crispins staging tree