Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop
authorlhh <lhh@rock-chips.com>
Fri, 10 Dec 2010 06:24:03 +0000 (14:24 +0800)
committerlhh <lhh@rock-chips.com>
Fri, 10 Dec 2010 06:24:03 +0000 (14:24 +0800)

Trivial merge