Merge branch 'develop' of xwj@10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorxwj <xwj@rock-chips.com>
Sat, 11 Sep 2010 05:16:21 +0000 (13:16 +0800)
committerxwj <xwj@rock-chips.com>
Sat, 11 Sep 2010 05:16:21 +0000 (13:16 +0800)

Trivial merge