From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Thu, 16 Jun 2005 20:40:39 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.12~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97008082eacab047c189028202e055280f799ace;p=linux-2.6

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

97008082eacab047c189028202e055280f799ace