Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authoryxj <yxj@yxj-desktop.(none)>
Fri, 19 Aug 2011 03:24:48 +0000 (11:24 +0800)
committeryxj <yxj@yxj-desktop.(none)>
Fri, 19 Aug 2011 03:24:48 +0000 (11:24 +0800)
commit7a921172610f22fd8657a6359f7e29e4a1e2b25c
treec9dbd160fa2841c20e45fb26101d632225cd3ea7
parent8e7102f7cc9d6dba4cfdd86bc5fce7308ea7a28c
parent6e5474ed24258324609c01ea7a652e309021b3c3
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop