aboutsummaryrefslogtreecommitdiff
path: root/linux-user/cris
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-05-12 08:08:12 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-05-12 08:08:12 -0500
commit711c21280b2cb56060859cc574221a8bf40f908a (patch)
tree9f5385c53ac50e613ae34d4165d02460ef993f0f /linux-user/cris
parent89bb563f6912b3f538d6bdf5833881ed7cdbd923 (diff)
parent2f172849b63b166fe876aa97b411f63ee7d17467 (diff)
downloadqemu-711c21280b2cb56060859cc574221a8bf40f908a.zip
qemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.gz
qemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.bz2
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Conflicts: cpu-all.h
Diffstat (limited to 'linux-user/cris')
0 files changed, 0 insertions, 0 deletions