From: heyun <heyun@rock-chips.com>
Date: Mon, 15 Sep 2014 08:01:01 +0000 (+0800)
Subject: Merge branch 'develop-3.10'
X-Git-Tag: firefly_0821_release~4709
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a022323a061a6531f11abc3f195375d94444eb26;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop-3.10'
---

a022323a061a6531f11abc3f195375d94444eb26