Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 12 Mar 2014 17:53:37 +0000 (17:53 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 12 Mar 2014 17:53:37 +0000 (17:53 +0000)
commit750036a848ea913ba6343718ffa70da98f7eef6b
tree9204a5916542a40d1050f13086a06e134edc9d93
parent2f23e9ae2cc37788ae1211803a7f8545ae14df91
parent21143b615aaf6f1661a1a6e69f00a39e456cc168
Merge remote-tracking branch 'remotes/afaerber/tags/prep-for-upstream' into staging

PReP machine and devices

* ppc_rom.bin update and submodule

# gpg: Signature made Wed 12 Mar 2014 17:32:40 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/prep-for-upstream:
  prep: Update ppc_rom.bin
  Add OpenHack'Ware submodule

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