Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Tue, 28 Jun 2011 11:48:47 +0000 (19:48 +0800)
committer蔡枫 <cf@rock-chips.com>
Tue, 28 Jun 2011 11:48:47 +0000 (19:48 +0800)

Trivial merge