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
..
early_printk.c	x86/efi: Fix earlyprintk off-by-one bug	2013-11-28 20:16:56 +00:00
efi_32.c	x86/efi: Pass necessary EFI data for kexec via setup_data	2013-12-29 13:09:05 +00:00
efi_64.c	x86/efi: Delete superfluous global variables	2013-12-29 13:09:08 +00:00
efi_stub_32.S
efi_stub_64.S	x86/efi: Runtime services virtual mapping	2013-11-02 11:09:36 +00:00
efi-bgrt.c	x86/EFI: Properly init-annotate BGRT code	2013-01-24 17:12:18 +01:00
efi.c	Linux 3.13-rc7	2014-01-05 12:34:29 +01:00
Makefile	x86/efi: Add EFI framebuffer earlyprintk support	2013-10-28 18:09:58 +00:00