Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorroot <root@rockchip-MID.(none)>
Wed, 27 Apr 2011 09:40:39 +0000 (17:40 +0800)
committerroot <root@rockchip-MID.(none)>
Wed, 27 Apr 2011 09:40:39 +0000 (17:40 +0800)
commitb4249d5832322f24ed2d4f4375e4e464ef034b1b
treee6aac4cb5a312847ae22cc56b51cabc2607fd5bc
parent17f9d58048d21970732587bfd293c0ae43ced50d
parent4b4674fad140baf6a4434ff7afd384d7477e5d50
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop