Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlhh <lhh@rock-chips.com>
Thu, 27 Jan 2011 09:07:17 +0000 (17:07 +0800)
committerlhh <lhh@rock-chips.com>
Thu, 27 Jan 2011 09:07:17 +0000 (17:07 +0800)

Trivial merge