From: ubuntu <superboy@ubuntu.(none)>
Date: Tue, 22 Mar 2011 09:07:51 +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=b1695fb32948db07587dd8ed5a39c1d6a676b0bb;p=firefly-linux-kernel-4.4.55.git

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

b1695fb32948db07587dd8ed5a39c1d6a676b0bb