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

Trivial merge