From: zhaoyifeng <zyf@ubuntu-fs.(none)>
Date: Fri, 21 Jan 2011 10:03:37 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10792
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=76ffeeadb0262745a255204dc48bb9ce7c0787cf;p=firefly-linux-kernel-4.4.55.git

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

76ffeeadb0262745a255204dc48bb9ce7c0787cf