Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Fri, 22 Jul 2011 06:55:55 +0000 (14:55 +0800)
committer蔡枫 <cf@rock-chips.com>
Fri, 22 Jul 2011 06:55:55 +0000 (14:55 +0800)
commit520bb953884bbf015be976ac2d661c24b35cc478
treef2bd92877cf4587191266a969d3a3d047bdf1b99
parenta1b52cab73f9ae76d2a9db03e92353c44de15cf1
parent11daa202c701c24f6948dfe4b1e4e0a4fc393869
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop