Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorcmc <cmc@rock-chips.com>
Fri, 17 Dec 2010 07:06:34 +0000 (15:06 +0800)
committercmc <cmc@rock-chips.com>
Fri, 17 Dec 2010 07:06:34 +0000 (15:06 +0800)

Trivial merge