From: Linus Torvalds <torvalds@evo.osdl.org>
Date: Thu, 1 Sep 2005 17:56:57 +0000 (-0700)
Subject: Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm.git
X-Git-Tag: v2.6.14-rc1~1020
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b25dd2842bcaef2413db7a06c67034b187aa007f;p=linux-2.6

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

b25dd2842bcaef2413db7a06c67034b187aa007f