Ingo Molnar ef0b8b9a52 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

Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts

2014-01-05 12:34:29 +01:00

Makefile

Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts

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