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/

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>
116		116
117	---------------------------	117	---------------------------
118		118
119	What: PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
120	When: 2.6.35/2.6.36
121	Files: drivers/pcmcia/: pcmcia_ioctl.c
122	Why: With the 16-bit PCMCIA subsystem now behaving (almost) like a
123	normal hotpluggable bus, and with it using the default kernel
124	infrastructure (hotplug, driver core, sysfs) keeping the PCMCIA
125	control ioctl needed by cardmgr and cardctl from pcmcia-cs is
126	unnecessary and potentially harmful (it does not provide for
127	proper locking), and makes further cleanups and integration of the
128	PCMCIA subsystem into the Linux kernel device driver model more
129	difficult. The features provided by cardmgr and cardctl are either
130	handled by the kernel itself now or are available in the new
131	pcmciautils package available at
132	http://kernel.org/pub/linux/utils/kernel/pcmcia/
133
134	For all architectures except ARM, the associated config symbol
135	has been removed from kernel 2.6.34; for ARM, it will be likely
136	be removed from kernel 2.6.35. The actual code will then likely
137	be removed from kernel 2.6.36.
138	Who: Dominik Brodowski <linux@dominikbrodowski.net>
139
140	---------------------------
141
142	What: sys_sysctl	119	What: sys_sysctl
143	When: September 2010	120	When: September 2010
144	Option: CONFIG_SYSCTL_SYSCALL	121	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/