OSDN Git Service

Merge remote-tracking branch 'sstabellini/xen-2013-01-14' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 15 Jan 2013 22:49:18 +0000 (16:49 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 15 Jan 2013 22:49:18 +0000 (16:49 -0600)
* 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>

Trivial merge