From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 3 May 2005 22:27:24 +0000 (-0700)
Subject: Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
X-Git-Tag: v2.6.12-rc4~117^2~24
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84e48b6d64fdc29586bc7d9329f986cdae591a80;p=linux-2.6

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

84e48b6d64fdc29586bc7d9329f986cdae591a80