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

Trivial merge