summaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-26 19:40:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-26 19:40:31 -0700
commit258e43fdb00c73d424b114ae3850accd55b27cbb (patch)
tree62f252cc4cde2a816ad2d609d80616322b26da15 /drivers/crypto
parent804a007f5401f87fc6e7da1e8884dc32912e35d0 (diff)
parentdaf6c4501e048eed56b256401d030d6b28e92ff1 (diff)
downloadop-kernel-dev-258e43fdb00c73d424b114ae3850accd55b27cbb.zip
op-kernel-dev-258e43fdb00c73d424b114ae3850accd55b27cbb.tar.gz
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: mark CONFIG_CIFS_NFSD_EXPORT as BROKEN cifs: free blkcipher in smbhash
Diffstat (limited to 'drivers/crypto')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud