Merge branch 'mvebu/msi_pci' into for-next

author Jason Cooper <jason@lakedaemon.net>

Mon, 19 Aug 2013 21:27:13 +0000 (21:27 +0000)

committer Jason Cooper <jason@lakedaemon.net>

Mon, 19 Aug 2013 21:27:13 +0000 (21:27 +0000)
author Jason Cooper <jason@lakedaemon.net>
Mon, 19 Aug 2013 21:27:13 +0000 (21:27 +0000)
committer Jason Cooper <jason@lakedaemon.net>
Mon, 19 Aug 2013 21:27:13 +0000 (21:27 +0000)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/mips/Kconfig
Simple merge
diff --cc arch/powerpc/Kconfig
Simple merge
diff --cc arch/s390/Kconfig
Simple merge
diff --cc arch/x86/kernel/x86_init.c
Simple merge
author	Jason Cooper <jason@lakedaemon.net>
	Mon, 19 Aug 2013 21:27:13 +0000 (21:27 +0000)
committer	Jason Cooper <jason@lakedaemon.net>
	Mon, 19 Aug 2013 21:27:13 +0000 (21:27 +0000)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/x86_init.c	patch \|	diff1 \|	diff2 \|	blob \| history