Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop

author cmc <cmc@rock-chips.com>

Tue, 7 Dec 2010 08:10:09 +0000 (16:10 +0800)

committer cmc <cmc@rock-chips.com>

Tue, 7 Dec 2010 08:10:09 +0000 (16:10 +0800)
author cmc <cmc@rock-chips.com>
Tue, 7 Dec 2010 08:10:09 +0000 (16:10 +0800)
committer cmc <cmc@rock-chips.com>
Tue, 7 Dec 2010 08:10:09 +0000 (16:10 +0800)
diff --cc arch/arm/mach-rk29/board-rk29sdk.c

index 26ecad0789f6d81d0ac18a986b0eda224044eb74,a2dd20a54da87c78530f24fc3b35c2ba5efe8612..1727382932fd6ae3d3ff791adbe037b7f8374ffc

mode 100755,100644..100644
--- 1/arch/arm/mach-rk29/board-rk29sdk.c
--- 2/arch/arm/mach-rk29/board-rk29sdk.c
+++ b/arch/arm/mach-rk29/board-rk29sdk.c
author	cmc <cmc@rock-chips.com>
	Tue, 7 Dec 2010 08:10:09 +0000 (16:10 +0800)
committer	cmc <cmc@rock-chips.com>
	Tue, 7 Dec 2010 08:10:09 +0000 (16:10 +0800)