Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorzhaoyifeng <zyf@ubuntu-fs.(none)>
Mon, 24 Jan 2011 03:10:47 +0000 (11:10 +0800)
committerzhaoyifeng <zyf@ubuntu-fs.(none)>
Mon, 24 Jan 2011 03:10:47 +0000 (11:10 +0800)
commit4e03e36eb873035e167a1ffc8824e7a0b30cc04c
treef1b5f515125b7f415be3feb00889aae760068cb7
parent76ffeeadb0262745a255204dc48bb9ce7c0787cf
parent766ff239632d94aaa93152f60c7fe0e84865440f
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop