Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorCMY <cmy@rock-chips.com>
Mon, 18 Jul 2011 10:02:10 +0000 (18:02 +0800)
committerCMY <cmy@rock-chips.com>
Mon, 18 Jul 2011 10:02:10 +0000 (18:02 +0800)

Trivial merge