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

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  pci/intr_remapping: Allocate irq_iommu on node
  irq: Add irq_node() primitive
  irq: Make sure irq_desc for legacy irq get correct node setting
  genirq: Add prototype for handle_nested_irq()
  irq: Remove superfluous NULL pointer check in check_irq_resend()
  irq: Clean up by removing irqfixup MODULE_PARM_DESC()
  genirq: Fix comment describing suspend_device_irqs()
  genirq: Remove obsolete defines and typedefs

diff --combined Documentation/feature-removal-schedule.txt
index f0690bbbd73c3ddc647a383dd678dbd444de2b2d,82e8d1a5443352858ec41f4f968de9f3e75707bc..dae41960277b1e1820fe348550e64515fa60b76a
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -394,15 -394,6 +394,6 @@@ Who:      Thomas Gleixner <tglx@linutronix.d
  
  -----------------------------
  
- What: obsolete generic irq defines and typedefs
- When: 2.6.30
- Why:  The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t)
-       have been kept around for migration reasons. After more than two years
-       it's time to remove them finally
- Who:  Thomas Gleixner <tglx@linutronix.de>
- 
- ---------------------------
- 
  What: fakephp and associated sysfs files in /sys/bus/pci/slots/
  When: 2011
  Why:  In 2.6.27, the semantics of /sys/bus/pci/slots was redefined to
@@@ -468,27 -459,3 +459,27 @@@ Why:     cpu_policy_rwsem has a new cleane
        cpufreq core and contained inside cpufreq.c. Other dependent
        drivers should not use it in order to safely avoid lockdep issues.
  Who:  Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
 +
 +----------------------------
 +
 +What: sound-slot/service-* module aliases and related clutters in
 +      sound/sound_core.c
 +When: August 2010
 +Why:  OSS sound_core grabs all legacy minors (0-255) of SOUND_MAJOR
 +      (14) and requests modules using custom sound-slot/service-*
 +      module aliases.  The only benefit of doing this is allowing
 +      use of custom module aliases which might as well be considered
 +      a bug at this point.  This preemptive claiming prevents
 +      alternative OSS implementations.
 +
 +      Till the feature is removed, the kernel will be requesting
 +      both sound-slot/service-* and the standard char-major-* module
 +      aliases and allow turning off the pre-claiming selectively via
 +      CONFIG_SOUND_OSS_CORE_PRECLAIM and soundcore.preclaim_oss
 +      kernel parameter.
 +
 +      After the transition phase is complete, both the custom module
 +      aliases and switches to disable it will go away.  This removal
 +      will also allow making ALSA OSS emulation independent of
 +      sound_core.  The dependency will be broken then too.
 +Who:  Tejun Heo <tj@kernel.org>