Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoreddie <cf@rock-chips.com>
Fri, 2 Sep 2011 09:49:16 +0000 (17:49 +0800)
committereddie <cf@rock-chips.com>
Fri, 2 Sep 2011 09:49:16 +0000 (17:49 +0800)

Trivial merge