From: Ingo Molnar Date: Sun, 12 Oct 2008 10:49:27 +0000 (+0200) Subject: Merge branch 'linus' into x86/signal X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1389ac4b976abdc0555280dfc1aa2c3abcc19641;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'linus' into x86/signal Conflicts: arch/x86/kernel/signal_64.c --- 1389ac4b976abdc0555280dfc1aa2c3abcc19641