Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

diff --combined Documentation/feature-removal-schedule.txt
index daaf03eaea6eabc4ae239b6dfe79fa502c3d572b,9b743198f77a1c54283c2842f83015d03a88680b..8ae8dad8e1504801f0db34c33512a5e68ab1ca60
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -25,6 -25,13 +25,13 @@@ Who:        Adrian Bunk <bunk@stusta.de
  
  ---------------------------
  
+ What: drivers depending on OBSOLETE_OSS_DRIVER
+ When: January 2006
+ Why:  OSS drivers with ALSA replacements
+ Who:  Adrian Bunk <bunk@stusta.de>
+ 
+ ---------------------------
+ 
  What: RCU API moves to EXPORT_SYMBOL_GPL
  When: April 2006
  Files:        include/linux/rcupdate.h, kernel/rcupdate.c
@@@ -40,6 -47,17 +47,6 @@@ Who: Paul E. McKenney <paulmck@us.ibm.c
  
  ---------------------------
  
 -What: IEEE1394 Audio and Music Data Transmission Protocol driver,
 -      Connection Management Procedures driver
 -When: November 2005
 -Files:        drivers/ieee1394/{amdtp,cmp}*
 -Why:  These are incomplete, have never worked, and are better implemented
 -      in userland via raw1394 (see http://freebob.sourceforge.net/ for
 -      example.)
 -Who:  Jody McIntyre <scjody@steamballoon.com>
 -
 ----------------------------
 -
  What: raw1394: requests of type RAW1394_REQ_ISO_SEND, RAW1394_REQ_ISO_LISTEN
  When: November 2005
  Why:  Deprecated in favour of the new ioctl-based rawiso interface, which is
@@@ -49,6 -67,21 +56,21 @@@ Who:        Jody McIntyre <scjody@steamballoon
  
  ---------------------------
  
+ What: Video4Linux API 1 ioctls and video_decoder.h from Video devices.
+ When: July 2006
+ Why:  V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
+       series. The old API have lots of drawbacks and don't provide enough
+       means to work with all video and audio standards. The newer API is
+       already available on the main drivers and should be used instead.
+       Newer drivers should use v4l_compat_translate_ioctl function to handle
+       old calls, replacing to newer ones.
+       Decoder iocts are using internally to allow video drivers to
+       communicate with video decoders. This should also be improved to allow
+       V4L2 calls being translated into compatible internal ioctls.
+ Who:  Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+ 
+ ---------------------------
+ 
  What: i2c sysfs name change: in1_ref, vid deprecated in favour of cpu0_vid
  When: November 2005
  Files:        drivers/i2c/chips/adm1025.c, drivers/i2c/chips/adm1026.c
@@@ -58,6 -91,22 +80,22 @@@ Who:        Grant Coady <gcoady@gmail.com
  
  ---------------------------
  
+ What: remove EXPORT_SYMBOL(panic_timeout)
+ When: April 2006
+ Files:        kernel/panic.c
+ Why:  No modular usage in the kernel.
+ Who:  Adrian Bunk <bunk@stusta.de>
+ 
+ ---------------------------
+ 
+ What: remove EXPORT_SYMBOL(insert_resource)
+ When: April 2006
+ Files:        kernel/resource.c
+ Why:  No modular usage in the kernel.
+ Who:  Adrian Bunk <bunk@stusta.de>
+ 
+ ---------------------------
+ 
  What: PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
  When: November 2005
  Files:        drivers/pcmcia/: pcmcia_ioctl.c
@@@ -84,3 -133,29 +122,29 @@@ Why:      This interface has been obsoleted 
        to link against API-compatible library on top of libnfnetlink_queue 
        instead of the current 'libipq'.
  Who:  Harald Welte <laforge@netfilter.org>
+ 
+ ---------------------------
+ 
+ What: EXPORT_SYMBOL(lookup_hash)
+ When: January 2006
+ Why:  Too low-level interface.  Use lookup_one_len or lookup_create instead.
+ Who:  Christoph Hellwig <hch@lst.de>
+ 
+ ---------------------------
+ 
+ What: START_ARRAY ioctl for md
+ When: July 2006
+ Files:        drivers/md/md.c
+ Why:  Not reliable by design - can fail when most needed.
+       Alternatives exist
+ Who:  NeilBrown <neilb@suse.de>
+ 
+ ---------------------------
+ 
+ What: au1x00_uart driver
+ When: January 2006
+ Why:  The 8250 serial driver now has the ability to deal with the differences
+       between the standard 8250 family of UARTs and their slightly strange
+       brother on Alchemy SOCs.  The loss of features is not considered an
+       issue.
+ Who:  Ralf Baechle <ralf@linux-mips.org>