From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Mar 2011 00:39:54 +0000 (-0700)
Subject: Merge branches 'irq-cleanup-for-linus' and 'irq-fixes-for-linus' of git://git.kernel... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e5217fb8ae5527e95cff9474f7b3c0d8e3a35fea;p=openwrt%2Fstaging%2Fblogic.git

Merge branches 'irq-cleanup-for-linus' and 'irq-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'irq-cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  vlynq: Convert irq functions

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq; Fix cleanup fallout
  genirq: Fix typo and remove unused variable
  genirq: Fix new kernel-doc warnings
  genirq: Add setter for AFFINITY_SET in irq_data state
  genirq: Provide setter inline for IRQD_IRQ_INPROGRESS
  genirq: Remove handle_IRQ_event
  arm: Ns9xxx: Remove private irq flow handler
  powerpc: cell: Use the core flow handler
  genirq: Provide edge_eoi flow handler
  genirq: Move INPROGRESS, MASKED and DISABLED state flags to irq_data
  genirq: Split irq_set_affinity() so it can be called with lock held.
  genirq: Add chip flag for restricting cpu_on/offline calls
  genirq: Add chip hooks for taking CPUs on/off line.
  genirq: Add irq disabled flag to irq_data state
  genirq: Reserve the irq when calling irq_set_chip()
---

e5217fb8ae5527e95cff9474f7b3c0d8e3a35fea