Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq, irq.h: Fix kernel-doc warnings
  genirq: fix comment to say IRQ_WAKE_THREAD

diff --cc include/linux/irq.h
index 1e50c34f0062854ef167130ad349f1385adcb4d2,0c001c15752ae92c6a6f324902eea8351d252b49..cb2e77a3f7f75a770a38b955d561aed8e77d3907
--- 1/include/linux/irq.h
--- 2/include/linux/irq.h
+++ b/include/linux/irq.h
@@@ -421,9 -424,9 +421,9 @@@ extern int set_irq_msi(unsigned int irq
  
  #ifdef CONFIG_SMP
  /**
 - * init_alloc_desc_masks - allocate cpumasks for irq_desc
 + * alloc_desc_masks - allocate cpumasks for irq_desc
   * @desc:     pointer to irq_desc struct
-  * @cpu:      cpu which will be handling the cpumasks
+  * @node:     node which will be handling the cpumasks
   * @boot:     true if need bootmem
   *
   * Allocates affinity and pending_mask cpumask if required.

diff --cc kernel/irq/manage.c
Simple merge