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

* stable/drivers-3.2:
  xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel
  xen/pv-on-hvm kexec: update xs_wire.h:xsd_sockmsg_type from xen-unstable
  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
index b065c1bdfdf7684f21dac52ca0724538149deebf,31493e906bbd71b2fc351d1090fcc41120ea8b58..a54fc6f2026f76fd7e060e64d6369cfec27002f8
--- 1/drivers/xen/events.c
--- 2/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@@ -875,9 -902,9 +896,9 @@@ static int find_virq(unsigned int virq
  int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
  {
        struct evtchn_bind_virq bind_virq;
-       int evtchn, irq;
+       int evtchn, irq, ret;
  
 -      spin_lock(&irq_mapping_update_lock);
 +      mutex_lock(&irq_mapping_update_lock);
  
        irq = per_cpu(virq_to_irq, cpu)[virq];
  

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