From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Mon, 17 Nov 2014 16:02:46 +0000 (+0100)
Subject: Merge branch 'sunxi/fixes-for-3.18' into HEAD
X-Git-Tag: firefly_0821_release~176^2~2766^2~15^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=407fec5ab79c9e2bc1c224ae9b629decb77d1343;p=firefly-linux-kernel-4.4.55.git

Merge branch 'sunxi/fixes-for-3.18' into HEAD
---

407fec5ab79c9e2bc1c224ae9b629decb77d1343