Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorroot <root@rockchip-MID.(none)>
Tue, 1 Mar 2011 12:39:34 +0000 (20:39 +0800)
committerroot <root@rockchip-MID.(none)>
Tue, 1 Mar 2011 12:39:34 +0000 (20:39 +0800)

Trivial merge