Merge branch 'x86-grub2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 grub2 updates from Ingo Molnar:
 "This extends the x86 boot protocol to include an address for the RSDP
  table - utilized by Xen currently.

  Matching Grub2 patches are pending as well. (Juergen Gross)"

* 'x86-grub2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/acpi, x86/boot: Take RSDP address for boot params if available
  x86/boot: Add ACPI RSDP address to setup_header
  x86/xen: Fix boot loader version reported for PVH guests

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/xen/enlighten_pvh.c
Simple merge