move patches for xen-firmware into main xen patch queue
put in the right place
cope with another case of patch queue arrangement