Merge branch 'develop' of /home/rockchip/kernel into develop
author陈辉 <chenhui@rk29.(none)>
Tue, 19 Apr 2011 01:39:05 +0000 (09:39 +0800)
committer陈辉 <chenhui@rk29.(none)>
Tue, 19 Apr 2011 01:39:05 +0000 (09:39 +0800)

Trivial merge