Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorzhaoyifeng <zyf@ubuntu-fs.(none)>
Fri, 28 Jan 2011 01:55:28 +0000 (09:55 +0800)
committerzhaoyifeng <zyf@ubuntu-fs.(none)>
Fri, 28 Jan 2011 01:55:28 +0000 (09:55 +0800)

Trivial merge