git.stricted.de - GitHub/LineageOS/android_kernel_motorola

Merge branch 'linus' into x86/header-guards

Conflicts:

include/asm-x86/gpio.h
include/asm-x86/ide.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

19 files changed:

arch/x86/boot/compressed/misc.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/gpio.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/hugetlb.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/i387.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/io_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/io_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/ipi.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/page.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/paravirt.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable-3level.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/processor-flags.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/processor.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/thread_info.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/unistd_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/unistd_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/xen/page.h	diff1 \|	diff2 \|	blob \| history

arch/x86/boot/compressed/misc.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/gpio.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/hugetlb.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/i387.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/io_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/io_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/ipi.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/page.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/paravirt.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable-3level.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/processor-flags.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/processor.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/thread_info.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/unistd_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/unistd_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/xen/page.h	diff1 \|	diff2 \|	blob \| history