Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Sat, 25 Jun 2011 14:42:44 +0000 (22:42 +0800)
committer蔡枫 <cf@rock-chips.com>
Sat, 25 Jun 2011 14:42:44 +0000 (22:42 +0800)

Trivial merge