Merge remote-tracking branch 'sstabellini/xen-2013-12-01' into staging
authorAnthony Liguori <aliguori@amazon.com>
Fri, 6 Dec 2013 20:58:28 +0000 (12:58 -0800)
committerAnthony Liguori <aliguori@amazon.com>
Fri, 6 Dec 2013 20:58:28 +0000 (12:58 -0800)
commit9ed5dacbfa0f3f74238854776385f150b68e78b9
tree8c3ed48bd6e89fb2ee199ab6b2287ca2e17f165c
parentcdac7a7184065467ba45ec83a9abfeeae060ce4b
parent539891a85d17bd8c23a2547e52e26993350d2c3a
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>