Merge branch 'develop' of lhh@10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorlhh <lhh@rock-chips.com>
Sat, 10 Jul 2010 10:09:44 +0000 (18:09 +0800)
committerlhh <lhh@rock-chips.com>
Sat, 10 Jul 2010 10:09:44 +0000 (18:09 +0800)

Trivial merge