Pull sony into release branch

diff --combined MAINTAINERS
index 5a546e59456703b92884764390a6804e2a1f2318,7b3cd6dfa207e6f7a71f5aa4aad7a28038fa1261..a384551a597810724237d097cc622a9f3a14ecb7
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -247,13 -247,6 +247,13 @@@ L:       linux-acpi@vger.kernel.or
  W:    http://acpi.sourceforge.net/
  S:    Supported
  
 +ACPI VIDEO DRIVER
 +P:    Luming Yu
 +M:    luming.yu@intel.com
 +L:    linux-acpi@vger.kernel.org
 +W:    http://acpi.sourceforge.net/
 +S:    Supported
 +
  AD1816 SOUND DRIVER
  P:    Thorsten Knabe
  M:    Thorsten Knabe <linux@thorsten-knabe.de>
@@@ -591,30 -584,12 +591,30 @@@ W:      http://sourceforge.net/projects/acpi
  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
@@@ -627,11 -602,6 +627,11 @@@ P:       Haavard Skinnemoe
  M:    hskinnemoen@atmel.com
  S:    Supported
  
 +ATMEL SPI DRIVER
 +P:    Haavard Skinnemoen
 +M:    hskinnemoen@atmel.com
 +S:    Supported
 +
  ATMEL WIRELESS DRIVER
  P:    Simon Kelley
  M:    simon@thekelleys.org.uk
@@@ -647,12 -617,6 +647,12 @@@ W:       http://people.redhat.com/sgrubb/audi
  T:    git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git
  S:    Maintained
  
 +AUXILIARY DISPLAY DRIVERS
 +P:    Miguel Ojeda Sandonis
 +M:    maxextreme@gmail.com
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +
  AVR32 ARCHITECTURE
  P:    Haavard Skinnemoen
  M:    hskinnemoen@atmel.com
@@@ -854,18 -818,6 +854,18 @@@ L:       linux-kernel@vger.kernel.or
  L:    discuss@x86-64.org
  S:    Maintained
  
 +CFAG12864B LCD DRIVER
 +P:    Miguel Ojeda Sandonis
 +M:    maxextreme@gmail.com
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +
 +CFAG12864BFB LCD FRAMEBUFFER DRIVER
 +P:    Miguel Ojeda Sandonis
 +M:    maxextreme@gmail.com
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +
  COMMON INTERNET FILE SYSTEM (CIFS)
  P:    Steve French
  M:    sfrench@samba.org
@@@ -1014,12 -966,14 +1014,12 @@@ L:    cycsyn-devel@bazar.conectiva.com.b
  S:    Maintained
  
  CYCLADES ASYNC MUX DRIVER
 -M:    async@cyclades.com
  W:    http://www.cyclades.com/
 -S:    Supported
 +S:    Orphan
  
  CYCLADES PC300 DRIVER
 -M:    pc300@cyclades.com
  W:    http://www.cyclades.com/
 -S:    Supported
 +S:    Orphan
  
  DAMA SLAVE for AX.25
  P:    Joerg Reuter
@@@ -1142,7 -1096,7 +1142,7 @@@ S:      Supporte
  DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
  P:    Tobias Ringstrom
  M:    tori@unhappy.mine.nu
 -L:    linux-kernel@vger.kernel.org
 +L:    netdev@vger.kernel.org
  S:    Maintained
  
  DOCBOOK FOR DOCUMENTATION
@@@ -1999,12 -1953,6 +1999,12 @@@ M:    davem@davemloft.ne
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
 +KS0108 LCD CONTROLLER DRIVER
 +P:    Miguel Ojeda Sandonis
 +M:    maxextreme@gmail.com
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +
  LAPB module
  L:    linux-x25@vger.kernel.org
  S:    Orphan
@@@ -2395,7 -2343,7 +2395,7 @@@ S:      Maintaine
  NETWORKING [WIRELESS]
  P:    John W. Linville
  M:    linville@tuxdriver.com
 -L:    netdev@vger.kernel.org
 +L:    linux-wireless@vger.kernel.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
  S:    Maintained
  
@@@ -2529,18 -2477,6 +2529,18 @@@ L:    orinoco-devel@lists.sourceforge.ne
  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
 +
 +PA SEMI SMBUS DRIVER
 +P:    Olof Johansson
 +M:    olof@lixom.net
 +L:    i2c@lm-sensors.org
 +S:    Maintained
 +
  PARALLEL PORT SUPPORT
  P:    Phil Blundell
  M:    philb@gnu.org
@@@ -2710,7 -2646,7 +2710,7 @@@ S:      Supporte
  
  PRISM54 WIRELESS DRIVER
  P:    Prism54 Development Team
 -M:    prism54-private@prism54.org
 +M:    developers@islsm.org
  L:    netdev@vger.kernel.org
  W:    http://prism54.org
  S:    Maintained
@@@ -2855,7 -2791,7 +2855,7 @@@ M:      schwidefsky@de.ibm.co
  P:    Heiko Carstens
  M:    heiko.carstens@de.ibm.com
  M:    linux390@de.ibm.com
 -L:    linux-390@vm.marist.edu
 +L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  
@@@ -2863,7 -2799,7 +2863,7 @@@ S390 NETWORK DRIVER
  P:    Frank Pavlic
  M:    fpavlic@de.ibm.com
  M:    linux390@de.ibm.com
 -L:    linux-390@vm.marist.edu
 +L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  
@@@ -2871,7 -2807,7 +2871,7 @@@ S390 ZFCP DRIVE
  P:    Swen Schillig
  M:    swen@vnet.ibm.com
  M:    linux390@de.ibm.com
 -L:    linux-390@vm.marist.edu
 +L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  
@@@ -3068,6 -3004,8 +3068,8 @@@ S:      Maintaine
  SONY VAIO CONTROL DEVICE DRIVER
  P:    Stelian Pop
  M:    stelian@popies.net
+ P:    Mattia Dongili
+ M:    malattia@linux.it
  W:    http://popies.net/sonypi/
  S:    Maintained
  
@@@ -3077,12 -3015,6 +3079,12 @@@ M:    perex@suse.c
  L:    alsa-devel@alsa-project.org
  S:    Maintained
  
 +SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
 +P:    Liam Girdwood
 +M:    liam.girdwood@wolfsonmicro.com
 +L:    alsa-devel@alsa-project.org
 +S:    Supported
 +
  SPI SUBSYSTEM
  P:    David Brownell
  M:    dbrownell@users.sourceforge.net
@@@ -3333,11 -3265,6 +3335,11 @@@ L:    vtun@office.satix.ne
  W:    http://vtun.sourceforge.net/tun
  S:    Maintained
  
 +TURBOCHANNEL SUBSYSTEM
 +P:    Maciej W. Rozycki
 +M:    macro@linux-mips.org
 +S:    Maintained
 +
  U14-34F SCSI DRIVER
  P:    Dario Ballabio
  M:    ballabio_dario@emc.com
@@@ -3722,7 -3649,7 +3724,7 @@@ S:      Maintaine
  W83L51xD SD/MMC CARD INTERFACE DRIVER
  P:    Pierre Ossman
  M:    drzeus-wbsd@drzeus.cx
 -L:    wbsd-devel@list.drzeus.cx
 +L:    linux-kernel@vger.kernel.org
  W:    http://projects.drzeus.cx/wbsd
  S:    Maintained
  
@@@ -3786,7 -3713,6 +3788,7 @@@ P:      Andi Klee
  M:    ak@suse.de
  L:    discuss@x86-64.org
  W:    http://www.x86-64.org
 +T:    quilt ftp://ftp.firstfloor.org/pub/ak/x86_64/quilt-current
  S:    Maintained
  
  YAM DRIVER FOR AX.25

diff --combined drivers/misc/Kconfig
index bedae4ad3f74f1d916a0e2a7b555e39474244b31,d7e8969fc319ab37a3bc32167fe8bb5040ff23d1..80b199fa0aa9b7173fc684b1866de7c1c2e46b2f
--- 1/drivers/misc/Kconfig
--- 2/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -42,7 -42,7 +42,7 @@@ config SGI_IOC
  
  config TIFM_CORE
        tristate "TI Flash Media interface support (EXPERIMENTAL)"
 -      depends on EXPERIMENTAL
 +      depends on EXPERIMENTAL && PCI
        help
          If you want support for Texas Instruments(R) Flash Media adapters
          you should select this option and then also choose an appropriate
@@@ -69,25 -69,6 +69,25 @@@ config TIFM_7XX
            To compile this driver as a module, choose M here: the module will
          be called tifm_7xx1.
  
 +config ASUS_LAPTOP
 +        tristate "Asus Laptop Extras (EXPERIMENTAL)"
 +        depends on X86
 +        depends on ACPI
 +      depends on EXPERIMENTAL && !ACPI_ASUS
 +      depends on LEDS_CLASS
 +      depends on BACKLIGHT_CLASS_DEVICE
 +        ---help---
 +        This is the new Linux driver for Asus laptops. It may also support some
 +        MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
 +        standard ACPI events that go through /proc/acpi/events. It also adds
 +        support for video output switching, LCD backlight control, Bluetooth and
 +        Wlan control, and most importantly, allows you to blink those fancy LEDs.
 +
 +        For more information and a userspace daemon for handling the extra
 +        buttons see <http://acpi4asus.sf.net/>.
 +
 +        If you have an ACPI-compatible ASUS laptop, say Y or M here.
 +
  config MSI_LAPTOP
          tristate "MSI Laptop Extras"
          depends on X86
@@@ -107,4 -88,19 +107,19 @@@
  
          If you have an MSI S270 laptop, say Y or M here.
  
+ config SONY_LAPTOP
+       tristate "Sony Laptop Extras"
+       depends on X86 && ACPI
+       select BACKLIGHT_CLASS_DEVICE
+         ---help---
+         This mini-driver drives the SNC device present in the ACPI BIOS of
+         the Sony Vaio laptops.
+ 
+         It gives access to some extra laptop functionalities. In its current
+         form, this driver let the user set or query the screen brightness
+         through the backlight subsystem and remove/apply power to some
+         devices.
+ 
+         Read <file:Documentation/sony-laptop.txt> for more information.
+ 
  endmenu

diff --combined drivers/misc/Makefile
index 35da53c409c02c8f43b0bf81539e7988c2387c08,f86f9dcfcfe52c23b23e87376f5c67b20808b18c..7793ccd7904962c699340c53e8ef1cfa6389e9b1
--- 1/drivers/misc/Makefile
--- 2/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -6,8 -6,8 +6,9 @@@ obj- := misc.o   # Dummy rule to force bu
  obj-$(CONFIG_IBM_ASM)         += ibmasm/
  obj-$(CONFIG_HDPU_FEATURES)   += hdpuftrs/
  obj-$(CONFIG_MSI_LAPTOP)     += msi-laptop.o
 +obj-$(CONFIG_ASUS_LAPTOP)     += asus-laptop.o
  obj-$(CONFIG_LKDTM)           += lkdtm.o
  obj-$(CONFIG_TIFM_CORE)               += tifm_core.o
  obj-$(CONFIG_TIFM_7XX1)               += tifm_7xx1.o
  obj-$(CONFIG_SGI_IOC4)                += ioc4.o
+ obj-$(CONFIG_SONY_LAPTOP)     += sony-laptop.o