From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Jun 2011 02:40:31 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: 2.1b_release~3606
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=258e43fdb00c73d424b114ae3850accd55b27cbb;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

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
---

258e43fdb00c73d424b114ae3850accd55b27cbb