Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop
authorxbw <xbw@rock-chips.com>
Thu, 22 Sep 2011 04:37:02 +0000 (12:37 +0800)
committerxbw <xbw@rock-chips.com>
Thu, 22 Sep 2011 04:37:02 +0000 (12:37 +0800)
commit1ec81553a0858a8136eae6185f70fb05cb3352bd
treede0e3e9b7535cbc5dc74933a3ff2f8f29d6445f9
parentabaf233b4a5743f3979a7ad0c9b6ff07c6bab8be
parent5cce5b4334cb5c8b4c78913776a71a1fcbe25b93
Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop