Merge remote-tracking branch 'kraxel/ipxe.3' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 25 Mar 2013 18:13:53 +0000 (13:13 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 25 Mar 2013 18:13:53 +0000 (13:13 -0500)
# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/ipxe.3:
  ipxe: update binaries
  ipxe: disable two second timeout


Trivial merge