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


Trivial merge