Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorddl <ddl@rockchip.com>
Tue, 2 Aug 2011 07:24:14 +0000 (15:24 +0800)
committerddl <ddl@rockchip.com>
Tue, 2 Aug 2011 07:24:14 +0000 (15:24 +0800)

Trivial merge