tree 6ab14c4d57029b50bf6ec08b4b881bfad0625217
parent b8a173b25c887a606681fc35a46702c164d5b2d0
author Peter Maydell <peter.maydell@linaro.org> 1425342557 +0000
committer Peter Maydell <peter.maydell@linaro.org> 1425342557 +0000

Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging"

This reverts commit b8a173b25c887a606681fc35a46702c164d5b2d0, reversing
changes made to 5de090464f1ec5360c4f30faa01d8a9f8826cd58.

(I applied this pull request when I should not have done so, and
am now immediately reverting it.)

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