Merge branch 'develop' of lhh@10.10.10.201:/home/rockchip/rk2818/kernel into develop
authorlhh <lhh@rock-chips.com>
Thu, 9 Sep 2010 14:26:45 +0000 (22:26 +0800)
committerlhh <lhh@rock-chips.com>
Thu, 9 Sep 2010 14:26:45 +0000 (22:26 +0800)
commit0c92d3457205c02e3cc6fa6916650e7ba98598be
treea9e20422cade6f5a8312ecd3948d6a98db37d53a
parentf32db7c9e842a9663102c00ce1653463812fb96a
parent5a0e95e11083b1a8cb87ad582b363772d0ce5f3a
Merge branch 'develop' of lhh@10.10.10.201:/home/rockchip/rk2818/kernel into develop