From: eddie <cf@rock-chips.com>
Date: Mon, 22 Aug 2011 06:37:55 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9772^2~6
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6c28b6af948bc35f5f68c79379b87ab94c1b545c;p=firefly-linux-kernel-4.4.55.git

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

6c28b6af948bc35f5f68c79379b87ab94c1b545c