From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 22 Jul 2010 15:00:55 +0000 (+0100)
Subject: Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel... 
X-Git-Tag: firefly_0821_release~9833^2~1326^2^2~4
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=cb86ae95a0168be2acc6c48b1671ffaba1e5e39e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel-stable
---

cb86ae95a0168be2acc6c48b1671ffaba1e5e39e