Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoreddie <cf@rock-chips.com>
Wed, 24 Aug 2011 09:25:42 +0000 (17:25 +0800)
committereddie <cf@rock-chips.com>
Wed, 24 Aug 2011 09:25:42 +0000 (17:25 +0800)

Trivial merge