Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Tue, 16 Aug 2011 11:49:04 +0000 (19:49 +0800)
committer蔡枫 <cf@rock-chips.com>
Tue, 16 Aug 2011 11:49:04 +0000 (19:49 +0800)
commita23bd433d410b7f1bf7a453c48b240ebc83e26e2
treee60a7b2257ce746d427a33bfc2a4960ad6eb521a
parent48287afcba0beae1971224177dc591303bdddd14
parentecfe88a1ec5da40a2538cc675c54c478abbd817c
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop