From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 25 Feb 2006 00:00:36 +0000 (-0800)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.16-rc5~21
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c946160e601c70a0ae0aa807461dd0232bcaf3a7;p=linux-2.6

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

c946160e601c70a0ae0aa807461dd0232bcaf3a7