From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Fri, 22 Nov 2013 20:22:58 +0000 (+0100)
Subject: Merge branch 'sunxi/drivers-for-3.14' into sunxi/core-for-3.14
X-Git-Tag: firefly_0821_release~176^2~4586^2~3^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9b6d2fd15e0b55aa1ea206a722bce0201d3dfd5d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'sunxi/drivers-for-3.14' into sunxi/core-for-3.14
---

9b6d2fd15e0b55aa1ea206a722bce0201d3dfd5d