From: CMY <cmy@rock-chips.com>
Date: Wed, 9 May 2012 09:22:31 +0000 (+0800)
Subject: Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into 20120509-3
X-Git-Tag: firefly_0821_release~9216
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b660c11b55204da540c5214ec693dd0ac6b8a473;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into 20120509-3
---

b660c11b55204da540c5214ec693dd0ac6b8a473