Merge tag 'lsk-v3.10-15.09-android'

LSK Android 15.09 v3.10

diff --cc Makefile
Simple merge

diff --cc arch/arm64/mm/init.c
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/base/regmap/regmap.c
Simple merge

diff --cc drivers/cpufreq/cpufreq_stats.c
Simple merge

diff --cc drivers/gpu/drm/drm_crtc.c
Simple merge

diff --cc drivers/mmc/card/block.c
index f1e6e8586901d175a95f31e4336855dc5ba3e864,d0dabebcaadc96079f74f3f6593123b1161a30c7..45a922b432060e492588436fcd429caaf693cf45
mode 100755,100644..100755
--- 1/drivers/mmc/card/block.c
--- 2/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c

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

diff --cc drivers/regulator/core.c
Simple merge

diff --cc drivers/usb/serial/option.c
Simple merge

diff --cc drivers/usb/storage/unusual_devs.h
Simple merge

diff --cc fs/ext4/indirect.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/inode.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc net/mac80211/main.c
Simple merge