Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorxbw <xbw@rock-chips.com>
Tue, 20 Sep 2011 08:32:38 +0000 (16:32 +0800)
committerxbw <xbw@rock-chips.com>
Tue, 20 Sep 2011 08:32:38 +0000 (16:32 +0800)

Trivial merge