Merge branch 'develop' of lhh@192.168.1.29:/home/rockchip/kernel into develop
authorlhh <lhh@rock-chips.com>
Tue, 30 Nov 2010 01:50:58 +0000 (09:50 +0800)
committerlhh <lhh@rock-chips.com>
Tue, 30 Nov 2010 01:50:58 +0000 (09:50 +0800)
commitf1b2ce0514d68b0c57c108e73050deb4e6064260
tree4b3bf1f9b5b4d146f9e03c8ad27381fb246dd825
parenta93ac942ee0bccf1997b245eaab790d3e306caa3
parent2fcd8b788cd6f7b2c04a0a22779ee602f17f7142
Merge branch 'develop' of lhh@192.168.1.29:/home/rockchip/kernel into develop
arch/arm/mach-rk29/board-rk29sdk.c