From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 7 Nov 2005 00:58:11 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.15-rc1~716
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b54a063df48cb1296f744b5ba456c45ce7efff35;p=linux-2.6

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

b54a063df48cb1296f744b5ba456c45ce7efff35