Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoreddie <cf@rock-chips.com>
Mon, 22 Aug 2011 06:37:55 +0000 (14:37 +0800)
committereddie <cf@rock-chips.com>
Mon, 22 Aug 2011 06:37:55 +0000 (14:37 +0800)

Trivial merge