Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author徐建辉 <xjh@rockchips-.com>
Thu, 28 Apr 2011 02:20:58 +0000 (10:20 +0800)
committer徐建辉 <xjh@rockchips-.com>
Thu, 28 Apr 2011 02:20:58 +0000 (10:20 +0800)

Trivial merge