Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0
authorxbw <xbw@rock-chips.com>
Thu, 15 Dec 2011 03:06:19 +0000 (11:06 +0800)
committerxbw <xbw@rock-chips.com>
Thu, 15 Dec 2011 03:06:19 +0000 (11:06 +0800)

Trivial merge