From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 20 Jun 2009 18:30:01 +0000 (-0700)
Subject: Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2453d6ff6ffc5f0d496b7b14f509a26f99bf115e;p=mv-sheeva.git

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

* '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
---

2453d6ff6ffc5f0d496b7b14f509a26f99bf115e
diff --cc include/linux/irq.h
index 1e50c34f006,0c001c15752..cb2e77a3f7f
--- a/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.