Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoryzq <yzq@rock-chips.com>
Sat, 27 Aug 2011 07:53:17 +0000 (15:53 +0800)
committeryzq <yzq@rock-chips.com>
Sat, 27 Aug 2011 07:53:17 +0000 (15:53 +0800)

Trivial merge