Alex Shi 2120557722 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android ...

Conflicts:
	arch/arm64/kernel/armv8_deprecated.c
	arch/arm64/kernel/efi.c
	arch/arm64/kernel/entry.S
	arch/arm64/kernel/head.S
	arch/arm64/kernel/hw_breakpoint.c
	arch/arm64/mm/mmu.c
	include/linux/memblock.h
	mm/memblock.c

2017-07-11 16:22:22 +08:00

..

callchain.c

…

core.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-07-11 16:22:22 +08:00

hw_breakpoint.c

…

internal.h

…

Makefile

…

ring_buffer.c

…

uprobes.c

Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4

2016-09-20 10:17:00 +08:00