Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorxbw <xbw@rock-chips.com>
Thu, 22 Sep 2011 04:37:02 +0000 (12:37 +0800)
committerxbw <xbw@rock-chips.com>
Thu, 22 Sep 2011 04:37:02 +0000 (12:37 +0800)

Trivial merge