From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 2 Nov 2005 05:32:14 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: MMI-PSA29.97-13-9~53869^2~48
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7f36b1e9582c06d0ddef5f2416c9b17017647d1f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

7f36b1e9582c06d0ddef5f2416c9b17017647d1f