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)
commitd7ab57e74daa66b06bc71e72eee070ea2a26c432
treeaf5c807e0ed2dbfd76b29a1ca2d9c52708e49748
parente8dca4daf3d8bd53a5eee6e0b6f1e1251c166362
parent3220121d4deebfc318b0b6403d1ba8446a36d65d
Merge branch 'develop' of cmy@10.10.10.29:/home/rockchip/kernel into wif