From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 16 May 2005 17:27:11 +0000 (-0700)
Subject: Automatic merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git
X-Git-Tag: v2.6.12-rc5~177
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a4a7e02e27b4f542473772d588f81759c209fb3;p=linux-2.6

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

2a4a7e02e27b4f542473772d588f81759c209fb3