Merge branch 'develop' of zyf@10.10.10.29:/home/rockchip/kernel into develop
authorzhaoyifeng <zyf@ubuntu-fs.(none)>
Sat, 18 Dec 2010 00:33:08 +0000 (08:33 +0800)
committerzhaoyifeng <zyf@ubuntu-fs.(none)>
Sat, 18 Dec 2010 00:33:08 +0000 (08:33 +0800)

Trivial merge