Merge remote-tracking branch 'sstabellini/xen-2013-01-14' into staging
commit5e72179b8f16e05a33fea5f63856aa16dbb29048
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 15 Jan 2013 22:49:18 +0000 (15 16:49 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 15 Jan 2013 22:49:18 +0000 (15 16:49 -0600)
tree94f06b03ae4f28470f3876997d1f867b886bd5dd
parentcf7c3f0cb5a7129f57fa9e69d410d6a05031988c
parent7e7b7cba16faa7b721b822fa9ed8bebafa35700f
Merge remote-tracking branch 'sstabellini/xen-2013-01-14' into staging

* sstabellini/xen-2013-01-14:
  xen_disk: implement BLKIF_OP_FLUSH_DISKCACHE, remove BLKIF_OP_WRITE_BARRIER
  xen_disk: add persistent grant support to xen_disk backend
  xen_disk: fix memory leak

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>