diff --git a/[refs] b/[refs]
index 857871e77232..3fd8c892b4a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d6a4d0823b3b8e29156f5e698b5a68687afad32
+refs/heads/master: 2b46b37de73296018da02c2a421ac2a9cbccfa9f
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
index 56ace47f24d6..e6d47e8ca1ac 100644
--- a/trunk/drivers/xen/events.c
+++ b/trunk/drivers/xen/events.c
@@ -141,6 +141,8 @@ static void init_evtchn_cpu_bindings(void)
 	/* By default all event channels notify CPU#0. */
 	for (i = 0; i < nr_irqs; i++) {
 		struct irq_desc *desc = irq_to_desc(i);
+		if (!desc)
+			continue;
 		desc->affinity = cpumask_of_cpu(0);
 	}
 #endif