xen: unplug the emulated devices at resume time

Early after being resumed we need to unplug again the emulated devices.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

diff --cc arch/x86/xen/platform-pci-unplug.c
Simple merge

diff --cc arch/x86/xen/suspend.c
Simple merge

diff --cc arch/x86/xen/xen-ops.h
Simple merge