Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  staging: pcc_acpi: delete obsolete driver

drivers/staging/Kconfig

@@ -43,8 +43,6 @@ source "drivers/staging/echo/Kconfig"
 
 source "drivers/staging/at76_usb/Kconfig"
 
-source "drivers/staging/pcc-acpi/Kconfig"
-
 source "drivers/staging/poch/Kconfig"
 
 endif # STAGING

drivers/staging/Makefile

@@ -13,5 +13,4 @@ obj-$(CONFIG_W35UND)		+= winbond/
 obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/
 obj-$(CONFIG_ECHO)		+= echo/
 obj-$(CONFIG_USB_ATMEL)		+= at76_usb/
-obj-$(CONFIG_PCC_ACPI)		+= pcc-acpi/
 obj-$(CONFIG_POCH)		+= poch/

drivers/staging/pcc-acpi/Kconfig

@@ -1,11 +0,0 @@
-config PCC_ACPI
-	tristate "Panasonic ACPI Hotkey support"
-	depends on ACPI
-	default n
-	---help---
-	  This driver provides support for Panasonic hotkeys through the
-	  ACPI interface.  This works for the Panasonic R1 (N variant),
-	  R2, R3, T2, W2, and Y2 laptops.
-
-	  To compile this driver as a module, choose M here. The module
-	  will be called pcc-acpi.

drivers/staging/pcc-acpi/Makefile

@@ -1 +0,0 @@
-obj-$(CONFIG_PCC_ACPI)		+= pcc-acpi.o

drivers/staging/pcc-acpi/TODO

@@ -1,7 +0,0 @@
-TODO:
-	- Lindent fixes
-	- checkpatch.pl fixes
-	- verify that the acpi interface is correct
-	- remove /proc dependancy if needed (not sure yet.)
-
-Please send any patches for this driver to Greg Kroah-Hartman <greg@kroah.com>