Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author张文平 <zwp@rk29.(none)>
Thu, 22 Sep 2011 04:50:12 +0000 (12:50 +0800)
committer张文平 <zwp@rk29.(none)>
Thu, 22 Sep 2011 04:50:12 +0000 (12:50 +0800)

Trivial merge