Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorRich.jiangyk <jyk@rock-chips.com>
Thu, 16 Sep 2010 08:47:25 +0000 (16:47 +0800)
committerRich.jiangyk <jyk@rock-chips.com>
Thu, 16 Sep 2010 08:47:25 +0000 (16:47 +0800)

Trivial merge