Merge branch 'panasonic' into test

diff --combined MAINTAINERS
index 5edb541c2fadf4571ff0123ae81f39336314b2e7,fa3579382ed20fd8b58cf94b77978375aacef791..f9f6d4b75c5ec0d28e24c372c3d987af0ef09904
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1198,7 -1198,9 +1198,7 @@@ M:      hpa@zytor.co
  S:    Maintained
  
  CPUSETS
 -P:    Paul Jackson
  P:    Paul Menage
 -M:    pj@sgi.com
  M:    menage@google.com
  L:    linux-kernel@vger.kernel.org
  W:    http://www.bullopensource.org/cpuset/
@@@ -1415,8 -1417,8 +1415,8 @@@ M:      rdunlap@xenotime.ne
  S:    Maintained
  
  DOCKING STATION DRIVER
 -P:    Kristen Carlson Accardi
 -M:    kristen.c.accardi@intel.com
 +P:    Shaohua Li
 +M:    shaohua.li@intel.com
  L:    linux-acpi@vger.kernel.org
  S:    Supported
  
@@@ -1982,7 -1984,7 +1982,7 @@@ S:      Maintaine
  I2C/SMBUS STUB DRIVER
  P:    Mark M. Hoffman
  M:    mhoffman@lightlink.com
 -L:    lm-sensors@lm-sensors.org
 +L:    i2c@lm-sensors.org
  S:    Maintained
  
  I2C SUBSYSTEM
@@@ -2078,12 -2080,6 +2078,12 @@@ L:    linux-ide@vger.kernel.or
  L:    linux-scsi@vger.kernel.org
  S:    Orphan
  
 +IDLE-I7300
 +P:    Andy Henroid
 +M:    andrew.d.henroid@intel.com
 +L:    linux-pm@lists.linux-foundation.org
 +S:    Supported
 +
  IEEE 1394 SUBSYSTEM (drivers/ieee1394)
  P:    Ben Collins
  M:    ben.collins@ubuntu.com
@@@ -2710,7 -2706,6 +2710,7 @@@ MAN-PAGES: MANUAL PAGES FOR LINUX -- Se
  P:    Michael Kerrisk
  M:    mtk.manpages@gmail.com
  W:    http://www.kernel.org/doc/man-pages
 +L:    linux-man@vger.kernel.org
  S:    Supported
  
  MARVELL LIBERTAS WIRELESS DRIVER
@@@ -3153,6 -3148,11 +3153,11 @@@ M:    olof@lixom.ne
  L:    i2c@lm-sensors.org
  S:    Maintained
  
+ PANASONIC LAPTOP ACPI EXTRAS DRIVER
+ P:    Harald Welte
+ M:    laforge@gnumonks.org
+ S:    Maintained
+ 
  PARALLEL PORT SUPPORT
  L:    linux-parport@lists.infradead.org (subscribers-only)
  S:    Orphan
@@@ -3731,7 -3731,7 +3736,7 @@@ S:      Maintaine
  SIS 96X I2C/SMBUS DRIVER
  P:    Mark M. Hoffman
  M:    mhoffman@lightlink.com
 -L:    lm-sensors@lm-sensors.org
 +L:    i2c@lm-sensors.org
  S:    Maintained
  
  SIS FRAMEBUFFER DRIVER
@@@ -3838,12 -3838,11 +3843,12 @@@ S:   Maintaine
  
  SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
  P:    Liam Girdwood
 -M:    liam.girdwood@wolfsonmicro.com
 +M:    lrg@slimlogic.co.uk
  P:    Mark Brown
  M:    broonie@opensource.wolfsonmicro.com
  T:    git opensource.wolfsonmicro.com/linux-2.6-asoc
  L:    alsa-devel@alsa-project.org (subscribers-only)
 +W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
  
  SPI SUBSYSTEM

diff --combined drivers/misc/Kconfig
index 6abb95919c3898a00c684a48739a83f6ab51de73,ec21994a2daa91af027e2357360d71090b940c85..0ed74d076a27a3a25e89c2daa65fb642ec53118d
--- 1/drivers/misc/Kconfig
--- 2/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -145,7 -145,6 +145,7 @@@ config ACER_WM
        depends on NEW_LEDS
        depends on BACKLIGHT_CLASS_DEVICE
        depends on SERIO_I8042
 +      depends on RFKILL
        select ACPI_WMI
        ---help---
          This is a driver for newer Acer (and Wistron) laptops. It adds
@@@ -246,6 -245,17 +246,17 @@@ config MSI_LAPTO
  
          If you have an MSI S270 laptop, say Y or M here.
  
+ config PANASONIC_LAPTOP
+       tristate "Panasonic Laptop Extras"
+       depends on X86 && INPUT && ACPI
+         depends on BACKLIGHT_CLASS_DEVICE
+       ---help---
+         This driver adds support for access to backlight control and hotkeys
+         on Panasonic Let's Note laptops.
+ 
+         If you have a Panasonic Let's note laptop (such as the R1(N variant),
+         R2, R3, R5, T2, W2 and Y2 series), say Y.
+ 
  config COMPAL_LAPTOP
        tristate "Compal Laptop Extras"
        depends on X86