Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorzhaoyifeng <zyf@ubuntu-fs.(none)>
Mon, 21 Feb 2011 03:47:50 +0000 (11:47 +0800)
committerzhaoyifeng <zyf@ubuntu-fs.(none)>
Mon, 21 Feb 2011 03:47:50 +0000 (11:47 +0800)

Trivial merge