From: Anthony Liguori <aliguori@amazon.com>
Date: Tue, 5 Nov 2013 16:26:57 +0000 (-0800)
Subject: Merge remote-tracking branch 'kraxel/e820.1' into staging
X-Git-Tag: v1.7.0-rc0~25
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0d6e9a23ae6a839f4fa6e3e2816367e0ffa09869;p=users%2Fdwmw2%2Fqemu.git

Merge remote-tracking branch 'kraxel/e820.1' into staging

# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/e820.1:
  pc: register e820 entries for ram
  pc: add etc/e820 fw_cfg file

Message-id: 1383567431-13540-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
---

0d6e9a23ae6a839f4fa6e3e2816367e0ffa09869