| commit | ef0b8b9a521c65201bfca9747ee1bf374296133c | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sun Jan 05 12:34:29 2014 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Sun Jan 05 12:34:29 2014 +0100 |
| tree | 644c3390c07d06fb7807182a4935f7c3f675b157 | |
| parent | 5c12af0c41e3417e1939095325920463b5f8e726 [diff] | |
| parent | d6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc [diff] |
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>