Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorroot <root@rockchip-MID.(none)>
Wed, 27 Apr 2011 09:40:39 +0000 (17:40 +0800)
committerroot <root@rockchip-MID.(none)>
Wed, 27 Apr 2011 09:40:39 +0000 (17:40 +0800)

Trivial merge