Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Tue, 9 Aug 2011 13:43:15 +0000 (21:43 +0800)
committer蔡枫 <cf@rock-chips.com>
Tue, 9 Aug 2011 13:43:15 +0000 (21:43 +0800)
commitabe721639230bad3a444ba1db352c6fcbfce01fe
tree2c94d7ca329831fbb784d2500b05c1399f093cd8
parentdd52f36997c223fb57c75577caead7e9517ca95a
parent1bf5fe9a2f55bbe0cbb86189040a6d2cb5bea3a5
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop