Merge remote-tracking branch 'remotes/kraxel/tags/pull-fwcfg-20160202-1' into staging
commitdce0238c745b698e8464e59ec73354219f750f34
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 2 Feb 2016 14:27:12 +0000 (2 14:27 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 2 Feb 2016 14:27:12 +0000 (2 14:27 +0000)
tree0b82b504ea765c23af36010a52dbb29c743d7be5
parent074d1ccb42296f7a83ec10f3344c15be7c21fb75
parenta907ec52cc1aefc820768b6e341b56f8f3caaca7
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) <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>