Merge branch 'linus' into x86/urgent
authorThomas Gleixner <tglx@linutronix.de>
Fri, 22 Jun 2018 19:20:35 +0000 (21:20 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 22 Jun 2018 19:20:35 +0000 (21:20 +0200)
commit7731b8bc94e599c9a79e428f3359ff2c34b7576a
tree879f18ccbe274122f2d4f095b43cbc7f953e0ada
parent48e315618dc4dc8904182cd221e3d395d5d97005
parent9ffc59d57228d74809700be6f7ecb1db10292f05
Merge branch 'linus' into x86/urgent

Required to queue a dependent fix.
MAINTAINERS
arch/x86/Makefile
arch/x86/kernel/traps.c
arch/x86/mm/init_64.c