Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Thu, 21 Apr 2011 05:36:00 +0000 (13:36 +0800)
committer蔡枫 <cf@rock-chips.com>
Thu, 21 Apr 2011 05:36:00 +0000 (13:36 +0800)

Trivial merge