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

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

49e7dc54cd4cbdb439ecc4e06214b0ca1a1a72b4