Merge tag 'lsk-android-14.03' into develop-3.10
author黄涛 <huangtao@rock-chips.com>
Tue, 15 Apr 2014 04:51:10 +0000 (12:51 +0800)
committer黄涛 <huangtao@rock-chips.com>
Tue, 15 Apr 2014 04:51:10 +0000 (12:51 +0800)
lsk 14.03 Android release

1  2 
Makefile
arch/arm/mm/proc-v7.S
drivers/cpufreq/cpufreq_interactive.c
drivers/pinctrl/core.c
drivers/spi/spi.c
drivers/usb/core/hcd.c
drivers/usb/core/hub.c
drivers/usb/host/ehci-hcd.c
lib/Makefile

diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 176f8af0d576129c2f0aaae966ad743431c193ab,d53547d2e4c744c92b43ce55883351aa241f8fb4..01a518b927ea6cb94bf5dd11c3cf1a87c89bc1a4
mode 100755,100644..100755
index e1d00f011bfc5f62dafb28554a24a3f00dec9d57,3a2eb4cc89594b3f176fafee9be6c4d263433604..5b2dfded66f89f1b74c9a820c0406a761de2ab70
mode 100755,100644..100755
Simple merge
diff --cc lib/Makefile
Simple merge