Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
author蔡枫 <cf@rock-chips.com>
Tue, 19 Jul 2011 10:00:33 +0000 (18:00 +0800)
committer蔡枫 <cf@rock-chips.com>
Tue, 19 Jul 2011 10:00:33 +0000 (18:00 +0800)
commit3332f84e0b969bd699d783e00e72a9110929eeed
tree319c45ccdbd80b6db9723bad19c4df1b15bbaddb
parentd6b84a828960e2e9d937d0472b01dbfd5b3c9cfb
parentc41dd263406cad12ec15d39986a530be1d23ad11
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop