From: Michael Roth <mdroth@linux.vnet.ibm.com>
Date: Tue, 10 Jul 2012 19:08:37 +0000 (-0500)
Subject: Merge remote-tracking branch 'agraf/s390-for-upstream-1.1' into HEAD
X-Git-Tag: v1.1.1~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f52d0d639e96f30b226b853d931881d034c57308;p=users%2Fdwmw2%2Fqemu.git

Merge remote-tracking branch 'agraf/s390-for-upstream-1.1' into HEAD
---

f52d0d639e96f30b226b853d931881d034c57308