From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 3 Jan 2011 10:31:38 +0000 (+0000)
Subject: Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel... 
X-Git-Tag: firefly_0821_release~7613^2~3117^2^2~2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=50401d77ee4904673042dd737eed436067cc23f5;p=firefly-linux-kernel-4.4.55.git

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

50401d77ee4904673042dd737eed436067cc23f5