From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 31 Oct 2005 01:48:00 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=1480d0a31db62b9803f829cc0e5cc71935ffe3cc;p=linux-edison.git

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

1480d0a31db62b9803f829cc0e5cc71935ffe3cc