Merge branch 'develop' of /home/rockchip/kernel into develop
author杨云 <yangyun@rock-chips.com>
Wed, 20 Jul 2011 01:56:48 +0000 (09:56 +0800)
committer杨云 <yangyun@rock-chips.com>
Wed, 20 Jul 2011 01:56:48 +0000 (09:56 +0800)

Trivial merge