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

Trivial merge