]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
Merge remote-tracking branch 'kraxel/e820.1' into staging
authorAnthony Liguori <aliguori@amazon.com>
Tue, 5 Nov 2013 16:26:57 +0000 (08:26 -0800)
committerAnthony Liguori <aliguori@amazon.com>
Tue, 5 Nov 2013 16:26:57 +0000 (08:26 -0800)
# 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>

Trivial merge