From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 1 Jun 2005 23:32:03 +0000 (-0700)
Subject: Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.12-rc6~32
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16a789c11df5069576ef89f817348dbc6f3bd87e;p=linux-2.6

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
---

16a789c11df5069576ef89f817348dbc6f3bd87e