Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorzhaoyifeng <zyf@ubuntu-fs.(none)>
Fri, 28 Jan 2011 01:55:28 +0000 (09:55 +0800)
committerzhaoyifeng <zyf@ubuntu-fs.(none)>
Fri, 28 Jan 2011 01:55:28 +0000 (09:55 +0800)
commit0fb544f52496f8aa52362053d47e23acee583c5c
tree81cfab8c222f9f3b18fc177f91d5c3e106184632
parent7956dd3596ff1c210c8ed727e5ad22cdee415f65
parent3220121d4deebfc318b0b6403d1ba8446a36d65d
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop