From: ubuntu <superboy@ubuntu.(none)>
Date: Wed, 23 Mar 2011 01:55:17 +0000 (-0700)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f07f39ba0220e3fc1a20b69a09bce00a52f57121;p=firefly-linux-kernel-4.4.55.git

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

f07f39ba0220e3fc1a20b69a09bce00a52f57121