From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 25 Apr 2011 15:26:10 +0000 (-0500)
Subject: Merge remote-tracking branch 'awilliam/ipxe' into staging
X-Git-Tag: pull-nvme-20200902~9828
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dbf352ad6e55dc7b40c62b402289164265a4f17c;p=qemu-nvme.git

Merge remote-tracking branch 'awilliam/ipxe' into staging
---

dbf352ad6e55dc7b40c62b402289164265a4f17c