Merge remote-tracking branch 'remotes/kraxel/tags/pull-fwcfg-20160202-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 2 Feb 2016 14:27:12 +0000 (14:27 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 2 Feb 2016 14:27:12 +0000 (14:27 +0000)
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) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-fwcfg-20160202-1:
  nvme: generate OpenFirmware device path in the "bootorder" fw_cfg file

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge