From: xbw <xbw@rock-chips.com>
Date: Thu, 22 Sep 2011 05:47:17 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9767^2~12
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=15e077f636eb7245b9341e59d2f89f5436398dc6;p=firefly-linux-kernel-4.4.55.git

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

15e077f636eb7245b9341e59d2f89f5436398dc6