Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoryangkai <yangkai@ubuntu-fs>
Mon, 11 Apr 2011 03:40:55 +0000 (11:40 +0800)
committeryangkai <yangkai@ubuntu-fs>
Mon, 11 Apr 2011 03:40:55 +0000 (11:40 +0800)
commit03445612966b57884c3e9fcdfd5c60a0c04c0901
tree75b7a8cab78abf2ef464073f0c89ef4b4886cc63
parent55390a6b985cc3fece52cac3e37b6f9e72fa8648
parent2605e167db14b94f38604c65ac14c3a0bfa191f9
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop