summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-04-03 14:31:20 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-04-03 14:31:20 +0100
commit888157fe96f68488efcdf50cbdb6f72291ab903e (patch)
treea81d6c78e450a6cf5aef8763fdfc5a6f114f5b4f /VERSION
parentde03c3164accc21311c39327601fcdd95da301f3 (diff)
parentd25295d4efc53bf8521adf967445b8d087fe8d39 (diff)
downloadqemu-888157fe96f68488efcdf50cbdb6f72291ab903e.tar.gz
Merge remote-tracking branch 'remotes/riku/for-2.0' into staging
* remotes/riku/for-2.0: linux-user: pass correct host flags to accept4() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions