Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorxbw <xbw@rock-chips.com>
Wed, 21 Sep 2011 06:23:54 +0000 (14:23 +0800)
committerxbw <xbw@rock-chips.com>
Wed, 21 Sep 2011 06:23:54 +0000 (14:23 +0800)
commitf42cd1aee38130e25caa0dec15889d149f932f88
tree00923fad3a9fd628b1a22ba505f0457d06bf882e
parent011292810e55858cb60b33aba4f8adef231a3823
parent77923034a0af327fc71298d9ecfcf25d9c3a15bc
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop