Merge branch 'develop' of cmy@10.10.10.29:/home/rockchip/kernel into wif
authorcmy <cmy@cmy-desktop.(none)>
Fri, 28 Jan 2011 06:21:47 +0000 (22:21 -0800)
committercmy <cmy@cmy-desktop.(none)>
Fri, 28 Jan 2011 06:21:47 +0000 (22:21 -0800)

Trivial merge