Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming...
authorIngo Molnar <mingo@kernel.org>
Fri, 20 Sep 2013 07:52:09 +0000 (09:52 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 20 Sep 2013 07:52:09 +0000 (09:52 +0200)
commitee0424218cd385c334c7b8916c4dda3fb797b3ce
tree6e2264c21d2c025c18b0b36232be79b7d3ef8e44
parentf42bcf1aa84a4c4348d53ac3013eff2b642987e5
parent700870119f49084da004ab588ea2b799689efaf7
Merge tag 'efi-urgent' of git://git./linux/kernel/git/mfleming/efi into x86/urgent

Pull EFI fix from Matt Flemin:

" * Fix WARNING on i386 by only enabling a workaround for x86-64 since
    we've never encountered the bug on i386 - Josh Boyer "

Signed-off-by: Ingo Molnar <mingo@kernel.org>