From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 12 Dec 2012 09:18:39 +0000 (+0800)
Subject: Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
X-Git-Tag: firefly_0821_release~8110
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b77e0e84630332abb34237b5d874f5fd159c2afc;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Conflicts:
	Makefile
---

b77e0e84630332abb34237b5d874f5fd159c2afc