diff --git a/[refs] b/[refs]
index 10b8c5435fff..739c0dddb036 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7e25f3394ba05a6d64cb2be42c2765fe72ea6b2
+refs/heads/master: 472900b8b02bf3782b06dcf0acdef26811c2b995
diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h
index f486c4dee1bf..1939d42c21d2 100644
--- a/trunk/include/linux/irq.h
+++ b/trunk/include/linux/irq.h
@@ -129,6 +129,7 @@ struct irq_chip {
  *
  * @handle_irq:		highlevel irq-events handler [if NULL, __do_IRQ()]
  * @chip:		low level interrupt hardware access
+ * @msi_desc:		MSI descriptor
  * @handler_data:	per-IRQ data for the irq_chip methods
  * @chip_data:		platform-specific per-chip private data for the chip
  *			methods, to allow shared chip implementations
diff --git a/trunk/kernel/irq/chip.c b/trunk/kernel/irq/chip.c
index 76a9106a0bf4..e6dc8b8839dd 100644
--- a/trunk/kernel/irq/chip.c
+++ b/trunk/kernel/irq/chip.c
@@ -168,7 +168,7 @@ EXPORT_SYMBOL(set_irq_data);
 /**
  *	set_irq_data - set irq type data for an irq
  *	@irq:	Interrupt number
- *	@data:	Pointer to interrupt specific data
+ *	@entry:	Pointer to MSI descriptor data
  *
  *	Set the hardware irq controller data for an irq
  */