Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoryangkai <yangkai@ubuntu-fs>
Thu, 23 Jun 2011 10:18:55 +0000 (18:18 +0800)
committeryangkai <yangkai@ubuntu-fs>
Thu, 23 Jun 2011 10:18:55 +0000 (18:18 +0800)
commit80286c483ea6d80eb3bf86ebc7cb44b74709195a
treeccfe1bc8906f5475d1b8fa421ac774400d614485
parent5c5dd32130ab05bc5dafe4020473595bba84868d
parentac5f1288b8a368deea28268b389f12ffe975f596
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop