Merge branch 'develop-2.6.36' of 10.10.10.29:/home/rockchip/kernel-2.6.36 into develo...
authorddl <ddl@rockchip.com>
Thu, 4 Aug 2011 04:29:55 +0000 (12:29 +0800)
committerddl <ddl@rockchip.com>
Thu, 4 Aug 2011 04:29:55 +0000 (12:29 +0800)

Trivial merge