---

yaml
---
r: 46602
b: refs/heads/master
c: 31b9025
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7677ced48e2bbbb8d847d34f37e5d96d2b0e41e4
+refs/heads/master: 31b9025aa0f89b392077db3f87458fd46bcc4f58

trunk/Documentation/feature-removal-schedule.txt

@@ -274,7 +274,6 @@ Who:	Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
 
 ---------------------------
 
-<<<<<<< test:Documentation/feature-removal-schedule.txt
 What:	ACPI hotkey driver (CONFIG_ACPI_HOTKEY)
 When:	2.6.21
 Why:	hotkey.c was an attempt to consolidate multiple drivers that use
@@ -307,15 +306,8 @@ Why:	The ACPI namespace is effectively the symbol list for
 	the BIOS can be extracted and disassembled with acpidump
 	and iasl as documented in the pmtools package here:
 	http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils
-Who:	Len Brown <len.brown@intel.com>
-
----------------------------
 
-What:	ACPI procfs interface
-When:	July 2007
-Why:	After ACPI sysfs conversion, ACPI attributes will be duplicated
-	in sysfs and the ACPI procfs interface should be removed.
-Who:	Zhang Rui <rui.zhang@intel.com>
+Who:	Len Brown <len.brown@intel.com>
 
 ---------------------------
 
@@ -333,10 +325,3 @@ Why:	Unmaintained for years, superceded by JFFS2 for years.
 Who:	Jeff Garzik <jeff@garzik.org>
 
 ---------------------------
-
-What:   sk98lin network driver
-When:   July 2007
-Why:    In kernel tree version of driver is unmaintained. Sk98lin driver
-	replaced by the skge driver. 
-Who:    Stephen Hemminger <shemminger@osdl.org>
-

trunk/MAINTAINERS

@@ -584,30 +584,12 @@ W:	http://sourceforge.net/projects/acpi4asus
 W:	http://xf.iksaif.net/acpi4asus
 S:	Maintained
 
-ASUS LAPTOP EXTRAS DRIVER
-P:	Corentin Chary
-M:	corentincj@iksaif.net
-L:	acpi4asus-user@lists.sourceforge.net
-W:	http://sourceforge.net/projects/acpi4asus
-W:	http://xf.iksaif.net/acpi4asus
-S:	Maintained
-
 ATA OVER ETHERNET DRIVER
 P:	Ed L. Cashin
 M:	ecashin@coraid.com
 W:	http://www.coraid.com/support/linux
 S:	Supported
 
-ATL1 ETHERNET DRIVER
-P:	Jay Cliburn
-M:	jcliburn@gmail.com
-P:	Chris Snook
-M:	csnook@redhat.com
-L:	atl1-devel@lists.sourceforge.net
-W:	http://sourceforge.net/projects/atl1
-W:	http://atl1.sourceforge.net
-S:	Maintained
-
 ATM
 P:	Chas Williams
 M:	chas@cmf.nrl.navy.mil
@@ -2495,12 +2477,6 @@ L:	orinoco-devel@lists.sourceforge.net
 W:	http://www.nongnu.org/orinoco/
 S:	Maintained
 
-PA SEMI ETHERNET DRIVER
-P:	Olof Johansson
-M:	olof@lixom.net
-L:	netdev@vger.kernel.org
-S:	Maintained
-
 PARALLEL PORT SUPPORT
 P:	Phil Blundell
 M:	philb@gnu.org
@@ -2670,7 +2646,7 @@ S:	Supported
 
 PRISM54 WIRELESS DRIVER
 P:	Prism54 Development Team
-M:	developers@islsm.org
+M:	prism54-private@prism54.org
 L:	netdev@vger.kernel.org
 W:	http://prism54.org
 S:	Maintained

trunk/arch/i386/defconfig

@@ -466,8 +466,7 @@ CONFIG_FW_LOADER=y
 #
 # Plug and Play support
 #
-CONFIG_PNP=y
-CONFIG_PNPACPI=y
+# CONFIG_PNP is not set
 
 #
 # Block devices