Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorswj <swj@rock-chips.com>
Fri, 30 Jul 2010 08:25:01 +0000 (01:25 -0700)
committerswj <swj@rock-chips.com>
Fri, 30 Jul 2010 08:25:01 +0000 (01:25 -0700)
commit8533bd2e7f714003f18f6cfacf3dee50ca67c28e
treeee86a7efcf76160764699ddd9130c7ae35dfae4e
parent913629cacd1c28c452e7a489d35e416fa0047203
parent83b3c6cd97b2ae579261bfa9a13239366701456b
Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop