Merge branch 'xen-netback-control-ring'