From: Peter Maydell Date: Tue, 2 Feb 2016 14:27:12 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-fwcfg-20160202-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=dce0238c745b698e8464e59ec73354219f750f34;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-fwcfg-20160202-1' into staging nvme: generate OpenFirmware device path in the "bootorder" fw_cfg file # gpg: Signature made Tue 02 Feb 2016 12:54:04 GMT using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/kraxel/tags/pull-fwcfg-20160202-1: nvme: generate OpenFirmware device path in the "bootorder" fw_cfg file Signed-off-by: Peter Maydell --- dce0238c745b698e8464e59ec73354219f750f34