Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorzhaoyifeng <zyf@ubuntu-fs.(none)>
Sat, 12 Feb 2011 10:09:03 +0000 (18:09 +0800)
committerzhaoyifeng <zyf@ubuntu-fs.(none)>
Sat, 12 Feb 2011 10:09:03 +0000 (18:09 +0800)
commitcb544aec0aafbd15ab700f46a41533913d72683b
treeb843243cccdd6c4078805f58390e4a001faf1021
parent53d1dde42eb7cd920b95ad95012391b9e53a6d2f
parentb6b406a50f874c6467bbe1eeeb5998208ce8f4ae
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop