Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Fri, 22 Apr 2011 01:47:34 +0000 (09:47 +0800)
committer蔡枫 <cf@rock-chips.com>
Fri, 22 Apr 2011 01:47:34 +0000 (09:47 +0800)

Trivial merge