Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorcwz <cwz@rockchips.com>
Wed, 20 Apr 2011 02:47:51 +0000 (19:47 -0700)
committercwz <cwz@rockchips.com>
Wed, 20 Apr 2011 02:47:51 +0000 (19:47 -0700)
commitfa54e1894528c6272deceacecb2e5167603326df
tree7153d98e542dcecb2724566c16bbbfd59d189f9d
parente5d41b301732b2e59d7bd6e597ffff84ac4eaf74
parent32eef04ee28226c8f1deb84ca2b8adf5ef0420c7
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop