Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorsakura <sakura@sakura-desktop.(none)>
Mon, 27 Dec 2010 08:32:56 +0000 (16:32 +0800)
committersakura <sakura@sakura-desktop.(none)>
Mon, 27 Dec 2010 08:32:56 +0000 (16:32 +0800)
commitf2fa1bd9dabd1f1364a75c0bf29defc23a050900
treeebd51ceae5dfb42996b224f85aff20e54e7fc756
parent5ed71e9f7eca9ca5d47a7d2624b428534c14f142
parent264ab2fb93fba05eb7bf27097c0b06667a940b9e
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop