From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 4 Aug 2005 20:02:31 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.13-rc6~54
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cfa132cd06639c8ac5fe9ef776a7650f1d8c3e6;p=linux-2.6

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

7cfa132cd06639c8ac5fe9ef776a7650f1d8c3e6