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

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

d80d6fc08e111c411a349c4fa0c6d9bf41851087