Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Wed, 9 Mar 2011 03:32:06 +0000 (11:32 +0800)
committer蔡枫 <cf@rock-chips.com>
Wed, 9 Mar 2011 03:32:06 +0000 (11:32 +0800)

Trivial merge