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)
1  2 
arch/arm/mach-rk29/board-rk29sdk.c

Simple merge