Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Fri, 24 Jun 2011 14:40:11 +0000 (22:40 +0800)
committer蔡枫 <cf@rock-chips.com>
Fri, 24 Jun 2011 14:40:11 +0000 (22:40 +0800)
commit90b7169811cd406fd8567bba274e27eba00b885e
treec74f12537f7552bc4d074690d3cc1ff2fae6ad42
parent7902882ebb9fa52fa32d96a7b60e35a5415f3c1c
parentf8b83dd6e0b5636d10c6ca57e58977082b0badec
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop