From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 8 Jun 2005 18:43:17 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.12~68
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97d26b8042a6f14cc4a19e84e911a953363e3d69;p=linux-2.6

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

97d26b8042a6f14cc4a19e84e911a953363e3d69