tree ba4227309416ae19d56ac7191dbb4fd0c1784a8c
parent b49249d10324d0fd6fb29725c2807dfd80d0edbc
parent 9acbd26b0a5ac4a3d52d31034feb3d935e39032a
author Linus Torvalds <torvalds@linux-foundation.org> 1356138547 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1356138547 -0800

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French:
 "Misc small cifs fixes"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: eliminate cifsERROR variable
  cifs: don't compare uniqueids in cifs_prime_dcache unless server inode numbers are in use
  cifs: fix double-free of "string" in cifs_parse_mount_options