]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'kraxel/e820.1' into staging
authorAnthony Liguori <anthony@codemonkey.ws>
Thu, 31 Oct 2013 15:58:58 +0000 (16:58 +0100)
committerAnthony Liguori <anthony@codemonkey.ws>
Thu, 31 Oct 2013 15:58:58 +0000 (16:58 +0100)
* kraxel/e820.1:
  e820: pass high memory too.

Message-id: 1382008179-5968-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
1  2 
hw/i386/pc.c

diff --cc hw/i386/pc.c
Simple merge