Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Fri, 15 Jul 2011 14:13:33 +0000 (22:13 +0800)
committer蔡枫 <cf@rock-chips.com>
Fri, 15 Jul 2011 14:13:33 +0000 (22:13 +0800)
commit984b053a97454470c76f93ed7fb2cc26e1b9b48f
tree8f56a21d2206d6804efb53099b37a18117ad0f0e
parentad21ed9a454e8c4803deca0b6e7650cd8d612f54
parent514dce01b3eca19ac3d6270d5b404ed02fe643b3
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop