Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
commit258e43fdb00c73d424b114ae3850accd55b27cbb
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 02:40:31 +0000 (26 19:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 02:40:31 +0000 (26 19:40 -0700)
tree62f252cc4cde2a816ad2d609d80616322b26da15
parent804a007f5401f87fc6e7da1e8884dc32912e35d0
parentdaf6c4501e048eed56b256401d030d6b28e92ff1
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: mark CONFIG_CIFS_NFSD_EXPORT as BROKEN
  cifs: free blkcipher in smbhash