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

Trivial merge