Merge tag 'efi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi...
authorIngo Molnar <mingo@kernel.org>
Thu, 11 Jun 2015 14:42:49 +0000 (16:42 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 11 Jun 2015 14:42:49 +0000 (16:42 +0200)
commitd4f7743542f20c2b20b68bba856c281ba9c84e42
treee01fe3f9736d2851b67fe92e113942cb290194d5
parent6b33033c2482b439674807fe546bf2d4ed94a43e
parent3846c15820a1841225d0245afda4875af23dfbbe
Merge tag 'efi-next' of git://git./linux/kernel/git/mfleming/efi into x86/efi

Pull EFI build fix from Matt Fleming:

  - Fix ESRT build breakage on ia64 reported by Guenter Roeck. (Peter Jones)

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