Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Jan 2011 02:56:27 +0000 (12:56 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 31 Jan 2011 02:56:27 +0000 (12:56 +1000)
commit9fbf0c08d441888b977f7c459c8aa57f2c0cb6ad
tree000bfa464562b2432e7f9e7c371a40f4f24e4c7a
parent4fda116852fe21a3897c478ce64b77bb1ec6b3d6
parentee2c9258501f83d3ed0fd09ce5df1cec53312cf0
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: More crypto cleanup (try #2)
  CIFS: Add strictcache mount option
  CIFS: Implement cifs_strict_writev (try #4)
  [CIFS] Replace cifs md5 hashing functions with kernel crypto APIs