Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorxbw <xbw@rock-chips.com>
Sat, 8 Oct 2011 03:09:37 +0000 (11:09 +0800)
committerxbw <xbw@rock-chips.com>
Sat, 8 Oct 2011 03:09:37 +0000 (11:09 +0800)

Trivial merge