From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 27 Jul 2005 23:36:08 +0000 (-0700)
Subject: Merge master.kernel.org:/home/rmk/linux-2.6-arm-smp
X-Git-Tag: v2.6.13-rc4~25^2~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3334c39f1815d2911238c43f40840c3c7b378165;p=linux-2.6

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

3334c39f1815d2911238c43f40840c3c7b378165