Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorzhaoyifeng <zyf@ubuntu-fs.(none)>
Fri, 21 Jan 2011 10:03:37 +0000 (18:03 +0800)
committerzhaoyifeng <zyf@ubuntu-fs.(none)>
Fri, 21 Jan 2011 10:03:37 +0000 (18:03 +0800)
commit76ffeeadb0262745a255204dc48bb9ce7c0787cf
tree85c8a9872b96fb4b45837650d3494d677abbdeba
parent1cb77a4a765581b3bee1e227089584e711b9500a
parentab56b8fa40883e94812ad2adaf8cbea4f8e9ff74
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop