From: Steve French <sfrench@hera.kernel.org>
Date: Tue, 31 May 2005 21:32:44 +0000 (-0700)
Subject: Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
X-Git-Tag: v2.6.12~39^2~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af6f5e3247a68074e384ef93c0b4bce1b73c9d80;p=linux-2.6

Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
---

af6f5e3247a68074e384ef93c0b4bce1b73c9d80