Merge branch 'xend-delete-v2' of git://xenbits.xen.org/people/ianc/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Tue, 8 Apr 2014 14:49:52 +0000 (15:49 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 8 Apr 2014 14:49:52 +0000 (15:49 +0100)
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Trivial merge