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