Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoreddie <cf@rock-chips.com>
Thu, 1 Sep 2011 03:12:25 +0000 (11:12 +0800)
committereddie <cf@rock-chips.com>
Thu, 1 Sep 2011 03:12:25 +0000 (11:12 +0800)

Trivial merge