From: clb <clb@rock-chips.com>
Date: Fri, 29 Jul 2011 08:46:31 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~10053
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4f06e65cd86f09ed6992d961107bf48016a79afc;p=firefly-linux-kernel-4.4.55.git

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

4f06e65cd86f09ed6992d961107bf48016a79afc