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
..
efi	Linux 3.13-rc7	2014-01-05 12:34:29 +01:00
google	DMA-API: firmware/google/gsmi.c: avoid direct access to DMA masks	2013-10-31 14:49:17 +00:00
dcdbas.c	DMA-API: dcdbas: update DMA mask handing	2013-10-31 14:49:16 +00:00
dcdbas.h
dell_rbu.c
dmi_scan.c	dmi: Avoid unaligned memory access in save_mem_devices()	2013-11-03 10:40:12 +01:00
dmi-id.c
dmi-sysfs.c
edd.c
iscsi_ibft_find.c	efi: Make 'efi_enabled' a function to query EFI facilities	2013-01-30 11:51:59 -08:00
iscsi_ibft.c	switch ->is_visible() to returning umode_t	2012-01-03 22:54:55 -05:00
Kconfig	dell_rbu: Select CONFIG_FW_LOADER_USER_HELPER explicitly	2013-06-03 13:57:29 -07:00
Makefile	x86/efi: Don't select EFI from certain special ACPI drivers	2013-12-19 21:32:46 +01:00
memmap.c	firmware, memmap: fix firmware_map_entry leak	2013-04-29 15:54:38 -07:00
pcdp.c	pcdp: use early_ioremap/early_iounmap to access pcdp table	2012-07-30 17:25:11 -07:00
pcdp.h