Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 May 2010 00:09:40 +0000 (17:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 May 2010 00:09:40 +0000 (17:09 -0700)
commit6e0b7b2c39b91b467270dd0bc383914f99e1fb28
treebdd28cb3ab5653404220d2bd9089203168ef869f
parente4e47eb15b7884963efe7f98231009c5770a2c3d
parent4308ad801193f14ff42cb746da37cf07e35f0d08
Merge branch 'irq-core-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Clear CPU mask in affinity_hint when none is provided
  genirq: Add CPU mask affinity hint
  genirq: Remove IRQF_DISABLED from core code
  genirq: Run irq handlers with interrupts disabled
  genirq: Introduce request_any_context_irq()
  genirq: Expose irq_desc->node in proc/irq

Fixed up trivial conflicts in Documentation/feature-removal-schedule.txt
Documentation/feature-removal-schedule.txt
Documentation/filesystems/proc.txt