Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Tue, 28 Jun 2011 07:24:52 +0000 (15:24 +0800)
committer蔡枫 <cf@rock-chips.com>
Tue, 28 Jun 2011 07:24:52 +0000 (15:24 +0800)
commitdf10271a74e0927c8e18e2003862b8a8118305f9
tree8e3348d32bd66a506cb53f35ef5aad74bd29c0be
parentf1838475184cd3fd94656ce23bc3b3e0bd02d866
parent6bc26c18a21c5d4b93ba71ce3852324b9ba82ef3
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop