From: Steve French <sfrench@us.ibm.com>
Date: Sun, 13 Nov 2005 03:53:33 +0000 (-0800)
Subject: Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
X-Git-Tag: v2.6.15-rc3~138^2~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9;p=linux-2.6

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

1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9