Merge tag 'lsk-android-14.02' into develop-3.10

author 黄涛 <huangtao@rock-chips.com>

Wed, 12 Mar 2014 13:33:38 +0000 (21:33 +0800)

committer 黄涛 <huangtao@rock-chips.com>

Wed, 12 Mar 2014 13:33:38 +0000 (21:33 +0800)
author 黄涛 <huangtao@rock-chips.com>
Wed, 12 Mar 2014 13:33:38 +0000 (21:33 +0800)
committer 黄涛 <huangtao@rock-chips.com>
Wed, 12 Mar 2014 13:33:38 +0000 (21:33 +0800)
diff --cc Makefile
Simple merge
diff --cc drivers/ata/libata-core.c
Simple merge
diff --cc drivers/i2c/busses/Kconfig
Simple merge
diff --cc drivers/spi/spi.c
Simple merge
diff --cc drivers/usb/core/hub.c

index b45d9508dc7ad8d254e56e1c18b1b11acf90c3c3,e604645a1290a9c83b51d615604615e82b2f0e01..e1d00f011bfc5f62dafb28554a24a3f00dec9d57

mode 100755,100644..100755
--- 1/drivers/usb/core/hub.c
--- 2/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
author	黄涛 <huangtao@rock-chips.com>
	Wed, 12 Mar 2014 13:33:38 +0000 (21:33 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Wed, 12 Mar 2014 13:33:38 +0000 (21:33 +0800)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	patch \|	diff1 \|	diff2 \|	blob \| history