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

Trivial merge