Merge branch 'develop' of xjh@10.10.10.29:/home/rockchip/kernel into develop
authorroot <root@ubuntu.(none)>
Sat, 18 Dec 2010 01:34:56 +0000 (09:34 +0800)
committerroot <root@ubuntu.(none)>
Sat, 18 Dec 2010 01:34:56 +0000 (09:34 +0800)
commitbd73d529147752d70e197bc22563ab14766d4ded
tree8b650c54dff7b9eead3e333ce873a98183779b40
parent11e6961e43bd27081b6a5d05153ae21e378f0f51
parent20dbf9971e7c17cde86bee42f004bf1032ed2ae2
Merge branch 'develop' of xjh@10.10.10.29:/home/rockchip/kernel into develop
arch/arm/mach-rk29/board-rk29sdk.c