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: kvm-67rc2~4^2~21^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cf816ecb533ab96b883dfdc0db174598b5b5c4d2;p=users%2Fdwmw2%2Flinux.git

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

cf816ecb533ab96b883dfdc0db174598b5b5c4d2