Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

author Linus Torvalds <[email protected]>

Mon, 16 May 2016 23:40:14 +0000 (16:40 -0700)

committer Linus Torvalds <[email protected]>

Mon, 16 May 2016 23:40:14 +0000 (16:40 -0700)
author Linus Torvalds <[email protected]>
Mon, 16 May 2016 23:40:14 +0000 (16:40 -0700)
committer Linus Torvalds <[email protected]>
Mon, 16 May 2016 23:40:14 +0000 (16:40 -0700)
diff --cc arch/x86/crypto/sha-mb/sha1_mb.c
Simple merge
diff --cc arch/x86/kernel/hpet.c
Simple merge
author	Linus Torvalds <[email protected]>
	Mon, 16 May 2016 23:40:14 +0000 (16:40 -0700)
committer	Linus Torvalds <[email protected]>
	Mon, 16 May 2016 23:40:14 +0000 (16:40 -0700)
		1	2
arch/x86/crypto/sha-mb/sha1_mb.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/hpet.c	patch \|	diff1 \|	diff2 \|	blob \| history