From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 19 Apr 2008 16:17:34 +0000 (+0100)
Subject: Merge branch 'merge-fixes' into devel
X-Git-Tag: v2.6.26-rc1~1131^2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=cf816ecb533ab96b883dfdc0db174598b5b5c4d2;p=linux-2.6-omap-h63xx.git

Merge branch 'merge-fixes' into devel
---

cf816ecb533ab96b883dfdc0db174598b5b5c4d2