From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 24 Jan 2007 17:46:54 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.20-rc6~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5394cd218735bf462e72bb827fbb7e47fc15f2f0;p=linux-2.6-omap-h63xx.git

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

5394cd218735bf462e72bb827fbb7e47fc15f2f0