Merge branch 'develop' of lhh@192.168.1.29:/home/rockchip/kernel into develop
authorlhh <lhh@rock-chips.com>
Thu, 28 Oct 2010 03:46:42 +0000 (11:46 +0800)
committerlhh <lhh@rock-chips.com>
Thu, 28 Oct 2010 03:46:42 +0000 (11:46 +0800)

Trivial merge