Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
authorAlex Shi <alex.shi@linaro.org>
Tue, 20 Sep 2016 02:17:00 +0000 (10:17 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 20 Sep 2016 02:17:00 +0000 (10:17 +0800)
commitd2d693d1ba7d93ec7c5db8aca2da29a4c91f6782
tree41920dcc166c491e7192eb1e3ba3861dff479abf
parent573787341e57a73bf027c2ea3bdf18dc298ae0a0
parent1d074db69c46d62ce82b331c2080e2fcb710bf4a
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4

Conflicts:
set ARM64_WORKAROUND_CAVIUM_27456 to 12 in
arch/arm64/include/asm/cpufeature.h
and add asm/memory.h in arch/arm64/kernel/entry.S
arch/arm64/Kconfig
arch/arm64/include/asm/cpufeature.h
arch/arm64/include/asm/elf.h
arch/arm64/kernel/cpu_errata.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/smp.c
arch/arm64/mm/mmu.c
arch/arm64/mm/proc.S
include/linux/perf_event.h
kernel/events/uprobes.c
tools/perf/arch/x86/util/intel-pt.c