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: avoid buffer overflow in pcmcia_setup_isa_irq
  pcmcia: do not request windows if you don't need to
  pcmcia: insert PCMCIA device resources into resource tree
  pcmcia: export resource information to sysfs
  pcmcia: use struct resource for PCMCIA devices, part 2
  pcmcia: remove memreq_t
  pcmcia: move local definitions out of include/pcmcia/cs.h
  pcmcia: do not use io_req_t when calling pcmcia_request_io()
  pcmcia: do not use io_req_t after call to pcmcia_request_io()
  pcmcia: use struct resource for PCMCIA devices
  pcmcia: clean up cs.h
  pcmcia: use pcmica_{read,write}_config_byte
  pcmcia: remove cs_types.h
  pcmcia: remove unused flag, simplify headers
  pcmcia: remove obsolete CS_EVENT_ definitions
  pcmcia: split up central event handler
  pcmcia: simplify event callback
  pcmcia: remove obsolete ioctl

Conflicts in:
 - drivers/staging/comedi/drivers/*
 - drivers/staging/wlags49_h2/wl_cs.c
due to dev_info_t and whitespace changes

97 files changed, 1197 insertions, 3195 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index be7030e4dd73..6fdb837d940b 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -116,29 +116,6 @@ Who:	Mauro Carvalho Chehab <mchehab@infradead.org>
 
 ---------------------------
 
-What:   PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
-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 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/
-
-        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>
-
----------------------------
-
 What:   sys_sysctl
 When:   September 2010
 Option: CONFIG_SYSCTL_SYSCALL
diff --git a/Documentation/pcmcia/driver-changes.txt b/Documentation/pcmcia/driver-changes.txt
index 61bc4e943116..26c0f9c00545 100644
--- a/Documentation/pcmcia/driver-changes.txt
+++ b/Documentation/pcmcia/driver-changes.txt
@@ -1,4 +1,16 @@
 This file details changes in 2.6 which affect PCMCIA card driver authors:
+* pcmcia_request_io changes (as of 2.6.36)
+   Instead of io_req_t, drivers are now requested to fill out
+   struct pcmcia_device *p_dev->resource[0,1] for up to two ioport
+   ranges. After a call to pcmcia_request_io(), the ports found there
+   are reserved, after calling pcmcia_request_configuration(), they may
+   be used.
+
+* No dev_info_t, no cs_types.h (as of 2.6.36)
+   dev_info_t and a few other typedefs are removed. No longer use them
+   in PCM