Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
commit638dfeda3ef558b6d743d43d089e1c4a8cec321a
authorBlue Swirl <blauwirbel@gmail.com>
Sat, 14 Jul 2012 10:07:37 +0000 (14 10:07 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sat, 14 Jul 2012 10:07:37 +0000 (14 10:07 +0000)
tree5fdaa4f5769845ab7135334e199c0f05674214f3
parent6e2fe79da8853352e1cd401f86974c26b91ba3c8
parentfdec9918578ec38738ecf250fa2c2656a44796b5
Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf

* 's390-for-upstream' of git://repo.or.cz/qemu/agraf:
  s390: autodetect map private