Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorlhh <lhh@rock-chips.com>
Sun, 23 Jan 2011 10:49:30 +0000 (18:49 +0800)
committerlhh <lhh@rock-chips.com>
Sun, 23 Jan 2011 10:49:30 +0000 (18:49 +0800)
commit766ff239632d94aaa93152f60c7fe0e84865440f
tree08d54792c82061575f018f1f7ae43f2df714cfdc
parent4c626a0afa2bf8a6f5bef49b5bd6bc1d78559d82
parent148dd15746770712adfee55975675896c4878f3d
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop