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:
  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

diff --combined Documentation/feature-removal-schedule.txt
index a5e3811,9c31c2e..d9d3fbc
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -520,6 -520,29 +520,6 @@@ Who:      Hans de Goede <hdegoede@redhat.com
  
  ----------------------------
  
 -What: corgikbd, spitzkbd, tosakbd driver
 -When: 2.6.35
 -Files:        drivers/input/keyboard/{corgi,spitz,tosa}kbd.c
 -Why:  We now have a generic GPIO based matrix keyboard driver that
 -      are fully capable of handling all the keys on these devices.
 -      The original drivers manipulate the GPIO registers directly
 -      and so are difficult to maintain.
 -Who:  Eric Miao <eric.y.miao@gmail.com>
 -
 -----------------------------
 -
 -What: corgi_ssp and corgi_ts driver
 -When: 2.6.35
 -Files:        arch/arm/mach-pxa/corgi_ssp.c, drivers/input/touchscreen/corgi_ts.c
 -Why:  The corgi touchscreen is now deprecated in favour of the generic
 -      ads7846.c driver. The noise reduction technique used in corgi_ts.c,
 -      that's to wait till vsync before ADC sampling, is also integrated into
 -      ads7846 driver now. Provided that the original driver is not generic
 -      and is difficult to maintain, it will be removed later.
 -Who:  Eric Miao <eric.y.miao@gmail.com>
 -
 -----------------------------
 -
  What: capifs
  When: February 2011
  Files:        drivers/isdn/capi/capifs.*
@@@ -569,23 -592,7 +569,33 @@@ Who:     Len Brown <len.brown@intel.com
  
  ----------------------------
  
 +What: video4linux /dev/vtx teletext API support
 +When: 2.6.35
 +Files:        drivers/media/video/saa5246a.c drivers/media/video/saa5249.c
 +      include/linux/videotext.h
 +Why:  The vtx device nodes have been superseded by vbi device nodes
 +      for many years. No applications exist that use the vtx support.
 +      Of the two i2c drivers that actually support this API the saa5249
 +      has been impossible to use for a year now and no known hardware
 +      that supports this device exists. The saa5246a is theoretically
 +      supported by the old mxb boards, but it never actually worked.
 +
 +      In summary: there is no hardware that can use this API and there
 +      are no applications actually implementing this API.
 +
 +      The vtx support still reserves minors 192-223 and we would really
 +      like to reuse those for upcoming new functionality. In the unlikely
 +      event that new hardware appears that wants to use the functionality
 +      provided by the vtx API, then that functionality should be build
 +      around the sliced VBI API instead.
 +Who:  Hans Verkuil <hverkuil@xs4all.nl>
++
++----------------------------
++
+ What: IRQF_DISABLED
+ When: 2.6.36
+ Why:  The flag is a NOOP as we run interrupt handlers with interrupts disabled
+ Who:  Thomas Gleixner <tglx@linutronix.de>
++
++----------------------------
++

diff --combined Documentation/filesystems/proc.txt
index 1e359b6,6507d2a..fbce915
--- 1/Documentation/filesystems/proc.txt
--- 2/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@@ -316,7 -316,7 +316,7 @@@ address           perms offset  dev   i
  08049000-0804a000 rw-p 00001000 03:00 8312       /opt/test
  0804a000-0806b000 rw-p 00000000 00:00 0          [heap]
  a7cb1000-a7cb2000 ---p 00000000 00:00 0
 -a7cb2000-a7eb2000 rw-p 00000000 00:00 0          [threadstack:001ff4b4]
 +a7cb2000-a7eb2000 rw-p 00000000 00:00 0
  a7eb2000-a7eb3000 ---p 00000000 00:00 0
  a7eb3000-a7ed5000 rw-p 00000000 00:00 0
  a7ed5000-a8008000 r-xp 00000000 03:00 4222       /lib/libc.so.6
@@@ -352,6 -352,7 +352,6 @@@ is not associated with a file
   [stack]                  = the stack of the main process
   [vdso]                   = the "virtual dynamic shared object",
                              the kernel system call handler
 - [threadstack:xxxxxxxx]   = the stack of the thread, xxxxxxxx is the stack size
  
   or if empty, the mapping is anonymous.
  
@@@ -565,6 -566,10 +565,10 @@@ The default_smp_affinity mask applies t
  IRQs which have not yet been allocated/activated, and hence which lack a
  /proc/irq/[0-9]* directory.
  
+ The node file on an SMP system shows the node to which the device using the IRQ
+ reports itself as being attached. This hardware locality information does not
+ include information about any possible driver locality preference.
+ 
  prof_cpu_mask specifies which CPUs are to be profiled by the system wide
  profiler. Default value is ffffffff (all cpus).