From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sat, 30 Apr 2005 22:42:33 +0000 (-0700)
Subject: Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
X-Git-Tag: v2.6.12-rc4~136^2~190
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d651f3332340c232ff66b7f5bab66cb8903859f;p=linux-2.6

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

1d651f3332340c232ff66b7f5bab66cb8903859f