Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author陈辉 <chenhui@rk29.(none)>
Fri, 4 Mar 2011 10:05:30 +0000 (18:05 +0800)
committer陈辉 <chenhui@rk29.(none)>
Fri, 4 Mar 2011 10:05:30 +0000 (18:05 +0800)

Trivial merge