Merge branch 'x86/pmem'

author Ingo Molnar <mingo@kernel.org>

Tue, 7 Apr 2015 14:07:14 +0000 (16:07 +0200)

committer Ingo Molnar <mingo@kernel.org>

Tue, 7 Apr 2015 14:07:14 +0000 (16:07 +0200)
author Ingo Molnar <mingo@kernel.org>
Tue, 7 Apr 2015 14:07:14 +0000 (16:07 +0200)
committer Ingo Molnar <mingo@kernel.org>
Tue, 7 Apr 2015 14:07:14 +0000 (16:07 +0200)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/kernel/Makefile
Simple merge
diff --cc arch/x86/kernel/e820.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Tue, 7 Apr 2015 14:07:14 +0000 (16:07 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 7 Apr 2015 14:07:14 +0000 (16:07 +0200)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/e820.c	patch \|	diff1 \|	diff2 \|	blob \| history