From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 13 Jan 2012 15:00:22 +0000 (+0000)
Subject: Merge branch 'master' into fixes
X-Git-Tag: firefly_0821_release~3680^2~3692^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4de3a8e101150feaefa1139611a50ff37467f33e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' into fixes
---

4de3a8e101150feaefa1139611a50ff37467f33e