Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0
authorzhaoyifeng <zyf@rock-chips.com>
Sun, 1 Apr 2012 02:24:07 +0000 (10:24 +0800)
committerzhaoyifeng <zyf@rock-chips.com>
Sun, 1 Apr 2012 02:24:07 +0000 (10:24 +0800)
commit662b32f9c60397f36e2571f2d2e0600def9756ab
tree98af5765469280c717a7dd38e8f00d47c3108455
parent3ef9d32bbb96828d33414fd17d8bbcbf2fd2d4f6
parent85448bb704eb814f7eb80ccd6ee55c0f3e59a10a
Merge branch 'develop-3.0' of ssh://10.10.10.29/rk/kernel into develop-3.0