From: Anthony Liguori <aliguori@amazon.com>
Date: Fri, 6 Dec 2013 20:58:28 +0000 (-0800)
Subject: Merge remote-tracking branch 'sstabellini/xen-2013-12-01' into staging
X-Git-Tag: qemu-xen-4.5.0-rc1~308
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9ed5dacbfa0f3f74238854776385f150b68e78b9;p=qemu-xen.git

Merge remote-tracking branch 'sstabellini/xen-2013-12-01' into staging

# By Paul Durrant (1) and Wei Liu (1)
# Via Stefano Stabellini
* sstabellini/xen-2013-12-01:
  xen-pvdevice: make device-id property compulsory
  xen: fix two errors when debug is enabled

Message-id: alpine.DEB.2.02.1312011829000.3198@kaball.uk.xensource.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
---

9ed5dacbfa0f3f74238854776385f150b68e78b9