Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Fri, 15 Jul 2011 14:13:33 +0000 (22:13 +0800)
committer蔡枫 <cf@rock-chips.com>
Fri, 15 Jul 2011 14:13:33 +0000 (22:13 +0800)

Trivial merge