From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 25 Apr 2005 23:19:32 +0000 (-0700)
Subject: Automated merge of kernel.org:/home/rmk/linux-2.6-rmk.git
X-Git-Tag: v2.6.12-rc4~219
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab2fd30b668b1687a9ca9e9ea0b60145deeafe84;p=linux-2.6

Automated merge of kernel.org:/home/rmk/linux-2.6-rmk.git
---

ab2fd30b668b1687a9ca9e9ea0b60145deeafe84