Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author胡卫国 <hwg@rk29.(none)>
Mon, 15 Aug 2011 03:07:17 +0000 (11:07 +0800)
committer胡卫国 <hwg@rk29.(none)>
Mon, 15 Aug 2011 03:07:17 +0000 (11:07 +0800)

Trivial merge