From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Fri, 29 Apr 2005 22:06:00 +0000 (-0700)
Subject: Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
X-Git-Tag: v2.6.12-rc4~136^2~196
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=dd96a8e056e7b3e480197ff2cdf106b46455d779;p=linux.git

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

dd96a8e056e7b3e480197ff2cdf106b46455d779