Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

Merge tag 'lsk-v3.10-android-14.07' into develop-3.10

LSK v3.10 Android 14.07 release

Conflicts:
drivers/clocksource/arm_arch_timer.c
lib/Makefile

21 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch_timer.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/arch_timer.h	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-core.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/arm_arch_timer.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_interactive.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/rtsx_pci_sdmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ion/rockchip/rockchip_ion.c	diff1 \|	\|	blob \| history
drivers/tty/serial/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/driver.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history
include/asm-generic/vmlinux.lds.h	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/arch_timer.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/arch_timer.h	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-core.c	diff1 \|	diff2 \|	blob \| history
drivers/clocksource/arm_arch_timer.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_interactive.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/hwmon/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/i2c/busses/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/host/rtsx_pci_sdmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/ion/rockchip/rockchip_ion.c	diff1 \|	\|	blob \| history
drivers/tty/serial/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/driver.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	diff1 \|	diff2 \|	blob \| history
include/asm-generic/vmlinux.lds.h	diff1 \|	diff2 \|	blob \| history
lib/Makefile	diff1 \|	diff2 \|	blob \| history