Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorcmc <cmc@rock-chips.com>
Thu, 24 Feb 2011 01:31:25 +0000 (09:31 +0800)
committercmc <cmc@rock-chips.com>
Thu, 24 Feb 2011 01:31:25 +0000 (09:31 +0800)

Trivial merge