Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Wed, 17 Aug 2011 04:27:24 +0000 (12:27 +0800)
committer蔡枫 <cf@rock-chips.com>
Wed, 17 Aug 2011 04:27:24 +0000 (12:27 +0800)

Trivial merge