From: yangkai <yangkai@ubuntu-fs>
Date: Fri, 17 Jun 2011 07:13:35 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10178
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=68d0b413f8bee6bb503eb9819751212e8cff60e9;p=firefly-linux-kernel-4.4.55.git

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

68d0b413f8bee6bb503eb9819751212e8cff60e9