Merge branch 'develop' of lhh@10.10.10.29:/home/rockchip/kernel into develop
authorlhh <lhh@rock-chips.com>
Sat, 25 Dec 2010 07:57:59 +0000 (15:57 +0800)
committerlhh <lhh@rock-chips.com>
Sat, 25 Dec 2010 07:57:59 +0000 (15:57 +0800)

Trivial merge