From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sat, 23 Sep 2006 12:34:10 +0000 (+0200)
Subject: Merge branch 'mainline' into upstream-linus
X-Git-Tag: v2.6.19-rc1~644^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=919251758195919ae3568021bc221e4f8c4b20eb;p=linux-2.6

Merge branch 'mainline' into upstream-linus
---

919251758195919ae3568021bc221e4f8c4b20eb