From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Thu, 28 Apr 2005 23:09:57 +0000 (-0700)
Subject: Automatic merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
X-Git-Tag: v2.6.12-rc4~181
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2604f6da1afb56fae5930b58349e43a2b0345933;p=linux-2.6

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

2604f6da1afb56fae5930b58349e43a2b0345933