Merge tag lsk-v3.10-15.03-android

lsk-v3.10-15.03-android release

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/compressed/Makefile
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc drivers/mmc/host/sdhci-pxav3.c
Simple merge

diff --cc drivers/pci/pci-driver.c
Simple merge

diff --cc drivers/usb/core/hcd.c
index b62703b89f7db2d7acd6c94517ced237dea9faae,cbfd3d14fa5aad4c5ef5b19615391893f468d6bd..5a7322d8bc0b38b930cff11e63e29f4851233a21
mode 100755,100644..100755
--- 1/drivers/usb/core/hcd.c
--- 2/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c

diff --cc fs/proc/generic.c
Simple merge

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

diff --cc lib/Kconfig
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc mm/mmap.c
Simple merge