Ingo Molnar ef0b8b9a52 Linux 3.13-rc7 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJSyJVbAAoJEHm+PkMAQRiGa28H/0m7GpZSpT8mvBthITxzqWCq JRkSPS4KTurAWlA5CJMJePyCM30DgN90s06bYUen9sTecZUwnL+qSV5OqAmg2r+0 PrfwtXtGZR6/Y12XlZ/3oFxVfUxjmgJyDAS76TIH1IvIum52nvJmLrR+6AyVphIX DkgBOuapdA7lia+U+ZM1cRkeHxUOKTUEw9v611VgoN3LYZyzyRb6d0rB7JtZN1RV dnXRi27enaPhwxelsCnORioRjsByMwD40CERxfLHmr5CGhmvCehBjO6bJ+KAdp14 52bfwWcNdbFMzUobcR7qlfS3Hy3AYJci+P6JzeeZ+kWEdv/eh5/1lvNuXtBJRlc= =iwzJ -----END PGP SIGNATURE----- Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts Conflicts: arch/x86/platform/efi/efi.c drivers/firmware/efi/Kconfig Signed-off-by: Ingo Molnar <mingo@kernel.org>		2014-01-05 12:34:29 +01:00
..
ce4100	arch/x86/platform/ce4100/ce4100.c: include reboot.h	2013-07-31 14:41:02 -07:00
efi	Linux 3.13-rc7	2014-01-05 12:34:29 +01:00
geode	x86/geode: Fix incorrect placement of __initdata tag	2013-10-01 13:21:27 +02:00
goldfish	goldfish: platform device for x86	2013-01-21 12:09:19 -08:00
intel-mid	x86, intel-mid: Do not re-introduce usage of obsolete __cpuinit	2013-11-07 10:44:03 -08:00
iris	arch/x86/platform/iris/iris.c: register a platform device and a platform driver	2012-12-18 15:02:11 -08:00
olpc	olpc_xo15_sci: convert acpi_evaluate_object() to acpi_execute_simple_method()	2013-09-24 01:37:53 +02:00
scx200	X86: drivers: remove __dev* attributes.	2013-01-03 15:57:04 -08:00
sfi	x86: Convert a few mistaken __cpuinit annotations to __init	2013-01-24 17:12:19 +01:00
ts5500	x86: Add TS-5500 platform support	2013-01-25 19:40:23 +01:00
uv	x86/UV: Fix NULL pointer dereference in uv_flush_tlb_others() if the 'nobau' boot option is used	2013-12-10 10:06:00 +01:00
visws	x86/apic: Fix typo EIO_ACK -> EOI_ACK and document it	2012-05-18 09:46:07 +02:00
Makefile	intel_mid: Renamed *mrst* to *intel_mid*	2013-10-17 16:40:36 -07:00