Merge branch 'stable/drivers-3.2' into linux-next

* stable/drivers-3.2:
  xen/pv-on-hvm kexec+kdump: reset PV devices in kexec or crash kernel
  xen/pv-on-hvm kexec: rebind virqs to existing eventchannel ports
  xen/pv-on-hvm kexec: prevent crash in xenwatch_thread() when stale watch events arrive

diff --cc drivers/xen/events.c
Simple merge

diff --cc drivers/xen/xenbus/xenbus_probe_frontend.c
Simple merge