From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 8 Nov 2005 23:15:31 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=9f04012c58a32756bbbd0239c4144e835048aa4d;p=linux-edison.git

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

9f04012c58a32756bbbd0239c4144e835048aa4d