Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorsakura <sakura@sakura-desktop.(none)>
Mon, 27 Dec 2010 08:32:56 +0000 (16:32 +0800)
committersakura <sakura@sakura-desktop.(none)>
Mon, 27 Dec 2010 08:32:56 +0000 (16:32 +0800)

Trivial merge