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: firefly_0821_release~21567^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cf816ecb533ab96b883dfdc0db174598b5b5c4d2;p=firefly-linux-kernel-4.4.55.git

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

cf816ecb533ab96b883dfdc0db174598b5b5c4d2