Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorzhaoyifeng <zyf@ubuntu-fs.(none)>
Sat, 12 Feb 2011 08:14:26 +0000 (16:14 +0800)
committerzhaoyifeng <zyf@ubuntu-fs.(none)>
Sat, 12 Feb 2011 08:14:26 +0000 (16:14 +0800)

Trivial merge