Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Fri, 12 Aug 2011 03:31:07 +0000 (11:31 +0800)
committer蔡枫 <cf@rock-chips.com>
Fri, 12 Aug 2011 03:31:07 +0000 (11:31 +0800)
commit0fbc68d4b542c89bae5d8a0d117ba1417d17e9f1
treeb85ade13cd2a29f2cc7f84ba37526d3e74b1ba70
parent261374e09824853a48580869068dfff93bfe356e
parent679160d05695dabac87c4a291c7d47884d572408
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop