Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorswj <swj@rock-chips.com>
Mon, 13 Sep 2010 09:09:34 +0000 (02:09 -0700)
committerswj <swj@rock-chips.com>
Mon, 13 Sep 2010 09:09:34 +0000 (02:09 -0700)

Trivial merge