Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorjiangyk <rich@rich_ubuntu.(none)>
Fri, 3 Sep 2010 03:56:51 +0000 (11:56 +0800)
committerjiangyk <rich@rich_ubuntu.(none)>
Fri, 3 Sep 2010 03:56:51 +0000 (11:56 +0800)

Trivial merge