From: xbw <xbw@rock-chips.com>
Date: Sat, 8 Oct 2011 03:09:37 +0000 (+0800)
Subject: Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
X-Git-Tag: firefly_0821_release~9766^2~39
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5a31adbf469181a7f01611a28b5873ad3c1d6f77;p=firefly-linux-kernel-4.4.55.git

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

5a31adbf469181a7f01611a28b5873ad3c1d6f77