From: ubuntu <superboy@ubuntu.(none)>
Date: Thu, 24 Mar 2011 01:59:30 +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=5dc059f53f03e3a293f1816ce4cda654298ab867;p=firefly-linux-kernel-4.4.55.git

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

5dc059f53f03e3a293f1816ce4cda654298ab867