Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0
authoryangkai <yk@rock-chips.com>
Thu, 15 Dec 2011 01:38:39 +0000 (09:38 +0800)
committeryangkai <yk@rock-chips.com>
Thu, 15 Dec 2011 01:38:39 +0000 (09:38 +0800)
commit10df84dcfbcf83824bd56694b211eb16627b7c7d
treea01c8bee43c804cf5404d565395ff155a28ab43d
parentc4c21f5d3a5076f34d6851635fe22e2dc38b6fca
parent857c5c8cde192338492d85206d9b9c06d87905ee
Merge branch 'develop-3.0' of 10.10.10.29:/home/rockchip/kernel into develop-3.0