From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 3 Nov 2005 02:38:22 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=cfa024f4e45562c50b9eccb23649ab103578037b;p=linux-edison.git

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

cfa024f4e45562c50b9eccb23649ab103578037b