diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 20:39:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 20:39:54 -0400 |
| commit | e5217fb8ae5527e95cff9474f7b3c0d8e3a35fea (patch) | |
| tree | eb85a4b7b02fb49a3534a976f79a3798393f7fc6 /include/linux | |
| parent | 5ede9ddfba424b5dad96e7ccd55607875a64ff6c (diff) | |
| parent | 8ec4ad2bebd1dd7e782bd1a1ac4c5e17ceb2ff81 (diff) | |
| parent | 0ef5ca1e1f0de71300142b8f730f26ded6a0c2f3 (diff) | |
Merge branches 'irq-cleanup-for-linus' and 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/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()