Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorswj <swj@rock-chips.com>
Wed, 11 Aug 2010 02:50:21 +0000 (19:50 -0700)
committerswj <swj@rock-chips.com>
Wed, 11 Aug 2010 02:50:21 +0000 (19:50 -0700)

Trivial merge