Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorroot <root@eddie-desktop.(none)>
Wed, 6 Jul 2011 07:06:30 +0000 (15:06 +0800)
committerroot <root@eddie-desktop.(none)>
Wed, 6 Jul 2011 07:06:30 +0000 (15:06 +0800)
commit5cec02a6d5358b91a1c324c4dd6923d203d61736
tree8e41234690c44f708faf2ee9c4e45e38aca59285
parent22c6164e51a5bde8cd2844d25d1e86d63f9d8342
parent254d8a82777290671df32e2574b337bffc84985a
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop