From: Steve French <sfrench@us.ibm.com>
Date: Wed, 9 Nov 2005 22:33:22 +0000 (-0800)
Subject: Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
X-Git-Tag: v2.6.15-rc1~18^2~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b;p=linux-2.6

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

e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b