On 22 June 2015 at 20:04, Markus Armbruster <arm...@redhat.com> wrote: > I'm afraid this pull is fairly prone to conflicts. Fingers crossed... > > The following changes since commit 0a3346f5dea0a679322df804e1e78d7c10d12a9f: > > Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' > into staging (2015-06-22 12:50:30 +0100) > > are available in the git repository at: > > > git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2015-06-22 > > for you to fetch changes up to a0b1a66ea39bca011108734147a72232a4d08c7a: > > Include monitor/monitor.h exactly where needed (2015-06-22 18:20:41 +0200) > > ---------------------------------------------------------------- > Monitor patches
Applied, thanks. (no conflicts :)) -- PMM