From: root <root@rockchip-MID.(none)>
Date: Tue, 19 Apr 2011 09:55:17 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10448
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=26d369603be3857a5b2db538086429391fc766a9;p=firefly-linux-kernel-4.4.55.git

Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
---

26d369603be3857a5b2db538086429391fc766a9