Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140327' into...
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 27 Mar 2014 15:29:33 +0000 (15:29 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 27 Mar 2014 15:29:33 +0000 (15:29 +0000)
commit6ff45f01c734e1ad051f19913449e2577c9f4b7d
treec471a8a31590faba7a963b4df9ef266ea94fd634
parent9ad665df2a9eeb8ed6f3501896e45c1a3cd9dd5f
parenta7a5544a3a59600f30f29985397f56ee40929850
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20140327' into staging

target-arm queue:
 * Don't default to integratorcp board if no machine specified

# gpg: Signature made Thu 27 Mar 2014 14:09:12 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"

* remotes/pmaydell/tags/pull-target-arm-20140327:
  vl.c: Improve message when no default machine is found
  hw/arm: Stop specifying integratorcp as the default board

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