From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 6 May 2014 11:23:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-smbios-2' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9898370497da3f18e0c9555b65c858eabc78ab50;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-smbios-2' into staging

smbios: make qemu generate smbios tables.

# gpg: Signature made Mon 05 May 2014 12:20:27 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-smbios-2:
  SMBIOS: Build aggregate smbios tables and entry point
  SMBIOS: Use bitmaps to prevent incompatible comand line options
  SMBIOS: Use macro to set smbios defaults
  SMBIOS: Update header file definitions
  SMBIOS: Rename symbols to better reflect future use
  E820: Add interface for accessing e820 table
  pc: add 2.1 machine type

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

9898370497da3f18e0c9555b65c858eabc78ab50