Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 24 Jan 2007 17:46:54 +0000 (09:46 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 24 Jan 2007 17:46:54 +0000 (09:46 -0800)
commit5394cd218735bf462e72bb827fbb7e47fc15f2f0
treebdbc64d378a015fd921d2adc1cac49752f3121f1
parent6f3776c9cd03998f0e6d11774a03aa1788b4e463
parent8e6f195af0e1f226e9b2e0256af8df46adb9d595
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] Fix oops when Windows server sent bad domain name null terminator
  [CIFS]  cifs sprintf fix
  [CIFS] Remove 2 unneeded kzalloc casts
  [CIFS] Update CIFS version number