From: lzg <lzg@rockchip.com>
Date: Mon, 15 Aug 2011 10:47:16 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9772^2~20^2~4^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=df225dcff95a031ef069719afce70fedb4be9bb7;p=firefly-linux-kernel-4.4.55.git

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

df225dcff95a031ef069719afce70fedb4be9bb7