From: Steve French <sfrench@us.ibm.com>
Date: Wed, 16 Nov 2005 00:49:04 +0000 (-0800)
Subject: Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
X-Git-Tag: v2.6.15-rc3~138^2~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c12489ad40a9db6b17225e0f38151d41c6175fe8;p=linux-2.6

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

c12489ad40a9db6b17225e0f38151d41c6175fe8