From: root <root@ubuntu.(none)>
Date: Sat, 18 Dec 2010 01:34:56 +0000 (+0800)
Subject: Merge branch 'develop' of xjh@10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10925
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bd73d529147752d70e197bc22563ab14766d4ded;p=firefly-linux-kernel-4.4.55.git

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

bd73d529147752d70e197bc22563ab14766d4ded