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)
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>

Trivial merge