Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoreddie <cf@rock-chips.com>
Tue, 23 Aug 2011 07:16:58 +0000 (15:16 +0800)
committereddie <cf@rock-chips.com>
Tue, 23 Aug 2011 07:16:58 +0000 (15:16 +0800)

Trivial merge