Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorswj <swj@rock-chips.com>
Fri, 30 Jul 2010 08:25:01 +0000 (01:25 -0700)
committerswj <swj@rock-chips.com>
Fri, 30 Jul 2010 08:25:01 +0000 (01:25 -0700)

Trivial merge