From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 25 Mar 2013 18:13:53 +0000 (-0500)
Subject: Merge remote-tracking branch 'kraxel/ipxe.3' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d2f38a0acb0a1c5b7ab7621a32d603d08d513bea;p=qemu.git

Merge remote-tracking branch 'kraxel/ipxe.3' into staging

# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/ipxe.3:
  ipxe: update binaries
  ipxe: disable two second timeout
---

d2f38a0acb0a1c5b7ab7621a32d603d08d513bea