Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: disable pcmcia ioctl for !ARM, prepare for removal
  pcmcia: CodingStyle fixes
  pcmcia: alchemy: fixup wrong comments
  pcmcia: remove irq_list parameter from pd6729
  yenta_socket: ENE CB712 CardBus bridge needs special treatment with Echo Audio Indigo soundcards

diff --combined Documentation/feature-removal-schedule.txt
index 73ef30dbe61263e4697bba21dec15c31d649d2b1,3e57a7502e863adb7d494bbec90788cdfa72a968..03497909539e7859d460b131c46c6e853af5e48a
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -84,6 -84,27 +84,6 @@@ Who: Luis R. Rodriguez <lrodriguez@athe
  
  ---------------------------
  
 -What: CONFIG_WIRELESS_OLD_REGULATORY - old static regulatory information
 -When: March 2010 / desktop catchup
 -
 -Why:  The old regulatory infrastructure has been replaced with a new one
 -      which does not require statically defined regulatory domains. We do
 -      not want to keep static regulatory domains in the kernel due to the
 -      the dynamic nature of regulatory law and localization. We kept around
 -      the old static definitions for the regulatory domains of:
 -
 -              * US
 -              * JP
 -              * EU
 -
 -      and used by default the US when CONFIG_WIRELESS_OLD_REGULATORY was
 -      set. We will remove this option once the standard Linux desktop catches
 -      up with the new userspace APIs we have implemented.
 -
 -Who:  Luis R. Rodriguez <lrodriguez@atheros.com>
 -
 ----------------------------
 -
  What: dev->power.power_state
  When: July 2007
  Why:  Broken design for runtime control over driver power states, confusing
@@@ -117,19 -138,25 +117,25 @@@ Who:    Mauro Carvalho Chehab <mchehab@inf
  ---------------------------
  
  What: PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
- When: November 2005
+ When: 2.6.35/2.6.36
  Files:        drivers/pcmcia/: pcmcia_ioctl.c
  Why:  With the 16-bit PCMCIA subsystem now behaving (almost) like a
        normal hotpluggable bus, and with it using the default kernel
        infrastructure (hotplug, driver core, sysfs) keeping the PCMCIA
        control ioctl needed by cardmgr and cardctl from pcmcia-cs is
-       unnecessary, and makes further cleanups and integration of the
+       unnecessary and potentially harmful (it does not provide for
+       proper locking), and makes further cleanups and integration of the
        PCMCIA subsystem into the Linux kernel device driver model more
        difficult. The features provided by cardmgr and cardctl are either
        handled by the kernel itself now or are available in the new
        pcmciautils package available at
        http://kernel.org/pub/linux/utils/kernel/pcmcia/
- Who:  Dominik Brodowski <linux@brodo.de>
+ 
+       For all architectures except ARM, the associated config symbol
+       has been removed from kernel 2.6.34; for ARM, it will be likely
+       be removed from kernel 2.6.35. The actual code will then likely
+       be removed from kernel 2.6.36.
+ Who:  Dominik Brodowski <linux@dominikbrodowski.net>
  
  ---------------------------
  
@@@ -540,13 -567,3 +546,13 @@@ Why:     The corgi touchscreen is now depre
        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.*
 +Why:  udev fully replaces this special file system that only contains CAPI
 +      NCCI TTY device nodes. User space (pppdcapiplugin) works without
 +      noticing the difference.
 +Who:  Jan Kiszka <jan.kiszka@web.de>