]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 02:40:31 +0000 (19:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 02:40:31 +0000 (19:40 -0700)
commitad59778cff63774681b0be1c0538425ad09d8cbf
tree62f252cc4cde2a816ad2d609d80616322b26da15
parentcf669b2caa39201860c79b6ebde7a4a2b4eab88c
parent224bb53031011f8e43cb9dced6fd47eea7a4214d
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