From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 May 2010 00:09:40 +0000 (-0700)
Subject: Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~23896
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6e0b7b2c39b91b467270dd0bc383914f99e1fb28;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

6e0b7b2c39b91b467270dd0bc383914f99e1fb28
diff --cc Documentation/feature-removal-schedule.txt
index a5e381185de9,9c31c2e63684..d9d3fbcb705d
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -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>
++
++----------------------------
++