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
..
cper.c	Move cper.c from drivers/acpi/apei to drivers/firmware/efi	2013-10-31 11:27:04 -07:00
efi-pstore.c	pstore: Don't allow high traffic options on fragile devices	2013-12-20 13:12:01 -08:00
efi-stub-helper.c	boot, efi: Remove redundant memset()	2013-10-04 20:07:47 +01:00
efi.c	efi: Export EFI runtime memory mapping to sysfs	2013-12-21 15:29:36 +00:00
efivars.c	efivars, efi-pstore: Hold off deletion of sysfs entry until the scan is completed	2013-11-28 20:16:55 +00:00
Kconfig	Linux 3.13-rc7	2014-01-05 12:34:29 +01:00
Makefile	Linux 3.13-rc7	2014-01-05 12:34:29 +01:00
runtime-map.c	efi: Export EFI runtime memory mapping to sysfs	2013-12-21 15:29:36 +00:00
vars.c	efivars, efi-pstore: Hold off deletion of sysfs entry until the scan is completed	2013-11-28 20:16:55 +00:00