summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-13 08:19:06 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-13 08:19:06 +0400
commit2513eb8e67a2483aecb5bf7fead7692d5aabbdcd (patch)
tree4969e9e0ae8a35553ef985af455e98beb86e2ed4 /Documentation
parentd3745f46e32d86de188cf378f923b7a2ed5274f9 (diff)
parentcd6ef2ada54aa4788d5a3dee3cffaad41383a52a (diff)
downloadlinux-2513eb8e67a2483aecb5bf7fead7692d5aabbdcd.tar.xz
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 of HEAD
* HEAD: [PATCH] The scheduled unexport of insert_resource [PATCH] remove kernel/power/pm.c:pm_unregister_all() [PATCH] Driver core: bus.c cleanups [PATCH] Driver core: kernel-doc in drivers/base/core.c corrections [PATCH] Driver core: fix driver-core kernel-doc
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/feature-removal-schedule.txt8
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index ee287988934e..47d714d70821 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -55,14 +55,6 @@ Who: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
---------------------------
-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