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

Trivial merge