From: Christoph Hellwig <hch@hera.kernel.org>
Date: Fri, 27 May 2005 08:16:24 +0000 (-0700)
Subject: Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
X-Git-Tag: v2.6.12-rc6~135^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b19312c4c8f3f84da57bba01d45549df1cf10dcd;p=linux-2.6

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

b19312c4c8f3f84da57bba01d45549df1cf10dcd