Merge branch 'develop' of lhh@10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorlhh <lhh@rock-chips.com>
Thu, 16 Sep 2010 08:45:42 +0000 (16:45 +0800)
committerlhh <lhh@rock-chips.com>
Thu, 16 Sep 2010 08:45:42 +0000 (16:45 +0800)

Trivial merge