From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 13 Jul 2006 23:38:58 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.18-rc2~82
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d10e47f9635ecafe5a9dc6e10cb056a87a4daa2;p=linux-2.6

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] CIFS_DEBUG2 depends on CIFS
---

0d10e47f9635ecafe5a9dc6e10cb056a87a4daa2