Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jun 2009 18:30:01 +0000 (11:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Jun 2009 18:30:01 +0000 (11:30 -0700)
* '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

1  2 
include/linux/irq.h
kernel/irq/manage.c

@@@ -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.
Simple merge