tree 5a9f4f813bda6aeb32715fa8f5d3dc8172605795
parent 300c215acd2462223a6595d3562dad67d0e10afd
parent 8ba10ab128e88bfbe58f7164543827ef3c3a2c88
author Linus Torvalds <torvalds@g5.osdl.org> 1152833938 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1152833938 -0700

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