Ingo Molnar 413d63d71b Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts ... Conflicts: arch/x86/kernel/head64.c arch/x86/mm/mmap.c Signed-off-by: Ingo Molnar <mingo@kernel.org>		2017-08-26 09:19:13 +02:00
..
asm	Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts	2017-08-26 09:19:13 +02:00
uapi/asm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2017-07-05 12:31:59 -07:00