tree fe62e019be7f666eca30c22d131373f1cf56285b
parent 81eb3dd8438802138ac9ce12428632f35562c060
parent 1252b3013b790c77e1c4f077a40542f86df37fb4
author Linus Torvalds <torvalds@linux-foundation.org> 1308075880 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1308075880 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] update cifs version to 1.73
  [CIFS] trivial cleanup fscache cFYI and cERROR messages
  cifs: correctly handle NULL tcon pointer in CIFSTCon
  cifs: show sec= option in /proc/mounts
  cifs: don't allow cifs_reconnect to exit with NULL socket pointer
  CIFS: Fix sparse error