Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorxbw <xbw@rock-chips.com>
Wed, 21 Sep 2011 06:23:54 +0000 (14:23 +0800)
committerxbw <xbw@rock-chips.com>
Wed, 21 Sep 2011 06:23:54 +0000 (14:23 +0800)

Trivial merge