Ingo Molnar e5185a76a2 Merge branch 'x86/boot' into x86/mm, to avoid conflict ... There's a conflict between ongoing level-5 paging support and the E820 rewrite. Since the E820 rewrite is essentially ready, merge it into x86/mm to reduce tree conflicts. Signed-off-by: Ingo Molnar <mingo@kernel.org>		2017-04-11 08:56:05 +02:00
..
atom	arch/x86/platform/atom: Move pmc_atom to drivers/platform/x86	2017-01-26 16:21:27 -08:00
ce4100	x86/init: Remove i8042_detect() from platform ops	2016-12-19 11:34:15 +01:00
efi	Merge branch 'x86/boot' into x86/mm, to avoid conflict	2017-04-11 08:56:05 +02:00
geode	x86/platform: Make platform/geode/net5501.c explicitly non-modular	2016-02-16 09:11:09 +01:00
goldfish	x86/platform/goldfish: Prevent unconditional loading	2017-02-15 08:49:58 -08:00
intel
intel-mid	x86/platform/intel-mid: Add power button support for Merrifield	2017-03-13 22:08:28 +01:00
intel-quark	x86/platform/intel/quark: Add printf attribute to imr_self_test_result()	2016-12-20 09:37:24 +01:00
iris
olpc	x86/platform/olpc: Fix resume handler build warning	2016-11-28 07:46:03 +01:00
scx200
sfi
ts5500	x86/platform: Delete extraneous MODULE_* tags fromm ts5500	2016-07-16 22:41:00 +02:00
uv	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2017-03-07 14:47:24 -08:00
Makefile	platform/x86: mlx-platform: Move module from arch/x86	2016-12-16 23:30:24 +02:00