Merge remote branch 'upstream/master' into invalid-domid
Merge remote branch 'upstream/master' into custom-init
Merge remote branch 'upstream/master' into invalid-domid
Missing driver_check_id function fixed
Fixing vmi_init to automatically add the VMI_CONFIG_FILE flag
Merging fix from custom-init
Merge branch 'invalid-domid' into xenstore