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

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

4adb18173aba217a7ce7f261427914d1350c4e18