Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

Pull x86 platform driver updates from Matthew Garrett:
 "Some significant updates to samsung-laptop, additional hardware
  support for Toshibas, misc updates to various hardware and a new
  backlight driver for some Apple machines."

Fix up trivial conflicts: geode Geos update happening next to net5501
support, and MSIC thermal platform support added twice.

* 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86: (77 commits)
  acer-wmi: add quirk table for video backlight vendor mode
  drivers/platform/x86/amilo-rfkill.c::amilo_rfkill_probe() avoid NULL deref
  samsung-laptop: unregister ACPI video module for some well known laptops
  acer-wmi: No wifi rfkill on Sony machines
  thinkpad-acpi: recognize Lenovo as version string in newer V-series BIOS
  asus-wmi: don't update power and brightness when using scalar
  eeepc-wmi: split et2012 specific hacks
  eeepc-wmi: refine quirks handling
  asus-nb-wmi: set panel_power correctly
  asus-wmi: move WAPF variable into quirks_entry
  asus-wmi: store backlight power status for AIO machine
  asus-wmi: add scalar board brightness adj. support
  samsung-laptop: cleanup return type: mode_t vs umode_t
  drivers, samsung-laptop: fix usage of isalnum
  drivers, samsung-laptop: fix initialization of sabi_data in sabi_set_commandb
  asus-wmi: on/off bit is not set when reading the value
  eeepc-wmi: add extra keymaps for EP121
  asus-nb-wmi: ignore useless keys
  acer-wmi: support Lenovo ideapad S205 Brazos wifi switch
  acer-wmi: fix out of input parameter size when set
  ...

diff --combined Documentation/ABI/testing/sysfs-driver-samsung-laptop
index e82e7c2b8f80c4f789d8bbb9a0b67be26e6fa023,f05b897805e56ca64ff4a92c8e879ef00d03a103..678819a3f8bf89e3b43e134979af2fa3f28199fd
--- 1/Documentation/ABI/testing/sysfs-driver-samsung-laptop
--- 2/Documentation/ABI/testing/sysfs-driver-samsung-laptop
+++ b/Documentation/ABI/testing/sysfs-driver-samsung-laptop
@@@ -1,7 -1,7 +1,7 @@@
  What:         /sys/devices/platform/samsung/performance_level
  Date:         January 1, 2010
  KernelVersion:        2.6.33
 -Contact:      Greg Kroah-Hartman <gregkh@suse.de>
 +Contact:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  Description:  Some Samsung laptops have different "performance levels"
                that are can be modified by a function key, and by this
                sysfs file.  These values don't always make a whole lot
@@@ -17,3 -17,21 +17,21 @@@
                Specifically, not all support the "overclock" option,
                and it's still unknown if this value even changes
                anything, other than making the user feel a bit better.
+ 
+ What:         /sys/devices/platform/samsung/battery_life_extender
+ Date:         December 1, 2011
+ KernelVersion:        3.3
+ Contact:      Corentin Chary <corentin.chary@gmail.com>
+ Description:  Max battery charge level can be modified, battery cycle
+               life can be extended by reducing the max battery charge
+               level.
+               0 means normal battery mode (100% charge)
+               1 means battery life extender mode (80% charge)
+ 
+ What:         /sys/devices/platform/samsung/usb_charge
+ Date:         December 1, 2011
+ KernelVersion:        3.3
+ Contact:      Corentin Chary <corentin.chary@gmail.com>
+ Description:  Use your USB ports to charge devices, even
+               when your laptop is powered off.
+               1 means enabled, 0 means disabled.

diff --combined MAINTAINERS
index 2cce20bbe39cbd4eb283f723154fdfcb67595257,0fc08ab7ad06a89c79ac46d9745a35b41d968bdd..f9faadef7ab7c07a0dec91c72389c93ab5f54f5d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -163,7 -163,7 +163,7 @@@ M: Greg Kroah-Hartman <gregkh@linuxfoun
  L:    linux-serial@vger.kernel.org
  W:    http://serial.sourceforge.net
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
  F:    drivers/tty/serial/8250*
  F:    include/linux/serial_8250.h
  
@@@ -464,7 -464,6 +464,7 @@@ ALPHA POR
  M:    Richard Henderson <rth@twiddle.net>
  M:    Ivan Kokshaysky <ink@jurassic.park.msu.ru>
  M:    Matt Turner <mattst88@gmail.com>
 +S:    Odd Fixes
  L:    linux-alpha@vger.kernel.org
  F:    arch/alpha/
  
@@@ -504,7 -503,7 +504,7 @@@ F: arch/x86/include/asm/geode.
  AMD IOMMU (AMD-VI)
  M:    Joerg Roedel <joerg.roedel@amd.com>
  L:    iommu@lists.linux-foundation.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
  S:    Supported
  F:    drivers/iommu/amd_iommu*.[ch]
  F:    include/linux/amd-iommu.h
@@@ -716,7 -715,6 +716,7 @@@ S: Maintaine
  ARM/CLKDEV SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
  F:    arch/arm/include/asm/clkdev.h
  F:    drivers/clk/clkdev.c
  
@@@ -786,6 -784,7 +786,6 @@@ M: Sascha Hauer <kernel@pengutronix.de
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.pengutronix.de/git/imx/linux-2.6.git
 -F:    arch/arm/mach-mx*/
  F:    arch/arm/mach-imx/
  F:    arch/arm/plat-mxc/
  
@@@ -815,12 -814,9 +815,12 @@@ S:       Maintaine
  
  ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT
  M:    Philipp Zabel <philipp.zabel@gmail.com>
 +M:    Paul Parsons <lost.distance@yahoo.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-pxa/hx4700.c
  F:    arch/arm/mach-pxa/include/mach/hx4700.h
 +F:    sound/soc/pxa/hx4700.c
  
  ARM/HP JORNADA 7XX MACHINE SUPPORT
  M:    Kristoffer Ericson <kristoffer.ericson@gmail.com>
@@@ -1409,7 -1405,7 +1409,7 @@@ F:      net/ax25
  B43 WIRELESS DRIVER
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  L:    linux-wireless@vger.kernel.org
 -L:    b43-dev@lists.infradead.org (moderated for non-subscribers)
 +L:    b43-dev@lists.infradead.org
  W:    http://linuxwireless.org/en/users/Drivers/b43
  S:    Maintained
  F:    drivers/net/wireless/b43/
@@@ -1418,7 -1414,6 +1418,7 @@@ B43LEGACY WIRELESS DRIVE
  M:    Larry Finger <Larry.Finger@lwfinger.net>
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  L:    linux-wireless@vger.kernel.org
 +L:    b43-dev@lists.infradead.org
  W:    http://linuxwireless.org/en/users/Drivers/b43
  S:    Maintained
  F:    drivers/net/wireless/b43legacy/
@@@ -1506,7 -1501,7 +1506,7 @@@ F:      drivers/i2c/busses/i2c-bfin-twi.
  
  BLOCK LAYER
  M:    Jens Axboe <axboe@kernel.dk>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    block/
  
@@@ -1576,6 -1571,7 +1576,6 @@@ F:      drivers/net/ethernet/broadcom/tg3.
  
  BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
  M:    Brett Rudley <brudley@broadcom.com>
 -M:    Henry Ptasinski <henryp@broadcom.com>
  M:    Roland Vossen <rvossen@broadcom.com>
  M:    Arend van Spriel <arend@broadcom.com>
  M:    Franky (Zhenhui) Lin <frankyl@broadcom.com>
@@@ -1644,7 -1640,7 +1644,7 @@@ BTTV VIDEO4LINUX DRIVE
  M:    Mauro Carvalho Chehab <mchehab@infradead.org>
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/bttv/
  F:    drivers/media/video/bt8xx/bttv*
@@@ -1674,7 -1670,7 +1674,7 @@@ F:      fs/cachefiles
  CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
  M:    Jonathan Corbet <corbet@lwn.net>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/cafe_ccic
  F:    drivers/media/video/marvell-ccic/
@@@ -1813,8 -1809,7 +1813,8 @@@ F:      Documentation/zh_CN
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <benve@cisco.com>
  M:    Roopa Prabhu <roprabhu@cisco.com>
 -M:    David Wang <dwang2@cisco.com>
 +M:    Neel Patel <neepatel@cisco.com>
 +M:    Nishank Trivedi <nistrive@cisco.com>
  S:    Supported
  F:    drivers/net/ethernet/cisco/enic/
  
@@@ -1836,16 -1831,8 +1836,16 @@@ L:    alsa-devel@alsa-project.org (moderat
  S:    Supported
  F:    sound/soc/codecs/cs4270*
  
 +CLEANCACHE API
 +M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    mm/cleancache.c
 +F:    include/linux/cleancache.h
 +
  CLK API
  M:    Russell King <linux@arm.linux.org.uk>
 +S:    Maintained
  F:    include/linux/clk.h
  
  CISCO FCOE HBA DRIVER
@@@ -2041,7 -2028,7 +2041,7 @@@ CX18 VIDEO4LINUX DRIVE
  M:    Andy Walls <awalls@md.metrocast.net>
  L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://linuxtv.org
  W:    http://www.ivtvdriver.org/index.php/Cx18
  S:    Maintained
@@@ -2114,13 -2101,6 +2114,13 @@@ W:    http://www.cyclades.com
  S:    Orphan
  F:    drivers/net/wan/pc300*
  
 +CYTTSP TOUCHSCREEN DRIVER
 +M:      Javier Martinez Canillas <javier@dowhile0.org>
 +L:      linux-input@vger.kernel.org
 +S:      Maintained
 +F:      drivers/input/touchscreen/cyttsp*
 +F:      include/linux/input/cyttsp.h
 +
  DAMA SLAVE for AX.25
  M:    Joerg Reuter <jreuter@yaina.de>
  W:    http://yaina.de/jreuter/
@@@ -2225,16 -2205,13 +2225,16 @@@ W:   http://lanana.org/docs/device-list/i
  S:    Maintained
  
  DEVICE-MAPPER  (LVM)
 -P:    Alasdair Kergon
 +M:    Alasdair Kergon <agk@redhat.com>
 +M:    dm-devel@redhat.com
  L:    dm-devel@redhat.com
  W:    http://sources.redhat.com/dm
  Q:    http://patchwork.kernel.org/project/dm-devel/list/
 +T:    quilt http://people.redhat.com/agk/patches/linux/editing/
  S:    Maintained
  F:    Documentation/device-mapper/
  F:    drivers/md/dm*
 +F:    drivers/md/persistent-data/
  F:    include/linux/device-mapper.h
  F:    include/linux/dm-*.h
  
@@@ -2265,15 -2242,6 +2265,15 @@@ F:    Documentation/filesystems/quota.tx
  F:    fs/quota/
  F:    include/linux/quota*.h
  
 +DISPLAYLINK USB 2.0 FRAMEBUFFER DRIVER (UDLFB)
 +M:    Bernie Thompson <bernie@plugable.com>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +W:    http://plugable.com/category/projects/udlfb/
 +F:    drivers/video/udlfb.c
 +F:    include/video/udlfb.h
 +F:    Documentation/fb/udlfb.txt
 +
  DISTRIBUTED LOCK MANAGER (DLM)
  M:    Christine Caulfield <ccaulfie@redhat.com>
  M:    David Teigland <teigland@redhat.com>
@@@ -2358,7 -2326,7 +2358,7 @@@ F:      Documentation/blockdev/drbd
  
  DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
  S:    Supported
  F:    Documentation/kobject.txt
  F:    drivers/base/
@@@ -2380,7 -2348,7 +2380,7 @@@ INTEL DRM DRIVERS (excluding Poulsbo, M
  M:    Keith Packard <keithp@keithp.com>
  L:    intel-gfx@lists.freedesktop.org (subscribers-only)
  L:    dri-devel@lists.freedesktop.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux.git
  S:    Supported
  F:    drivers/gpu/drm/i915
  F:    include/drm/i915*
@@@ -2395,6 -2363,15 +2395,6 @@@ S:     Supporte
  F:    drivers/gpu/drm/exynos
  F:    include/drm/exynos*
  
 -EXYNOS MIPI DISPLAY DRIVERS
 -M:    Inki Dae <inki.dae@samsung.com>
 -M:    Donghwa Lee <dh09.lee@samsung.com>
 -M:    Kyungmin Park <kyungmin.park@samsung.com>
 -L:    linux-fbdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/video/exynos/exynos_mipi*
 -F:    include/video/exynos_mipi*
 -
  DSCC4 DRIVER
  M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
@@@ -2675,21 -2652,6 +2675,21 @@@ M:    Mimi Zohar <zohar@us.ibm.com
  S:    Supported
  F:    security/integrity/evm/
  
 +EXYNOS DP DRIVER
 +M:    Jingoo Han <jg1.han@samsung.com>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/video/exynos/exynos_dp*
 +
 +EXYNOS MIPI DISPLAY DRIVERS
 +M:    Inki Dae <inki.dae@samsung.com>
 +M:    Donghwa Lee <dh09.lee@samsung.com>
 +M:    Kyungmin Park <kyungmin.park@samsung.com>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/video/exynos/exynos_mipi*
 +F:    include/video/exynos_mipi*
 +
  F71805F HARDWARE MONITORING DRIVER
  M:    Jean Delvare <khali@linux-fr.org>
  L:    lm-sensors@lm-sensors.org
@@@ -2974,8 -2936,8 +2974,8 @@@ GFS2 FILE SYSTE
  M:    Steven Whitehouse <swhiteho@redhat.com>
  L:    cluster-devel@redhat.com
  W:    http://sources.redhat.com/cluster/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git
  S:    Supported
  F:    Documentation/filesystems/gfs2*.txt
  F:    fs/gfs2/
@@@ -3016,42 -2978,42 +3016,42 @@@ F:   drivers/net/ethernet/aeroflex
  GSPCA FINEPIX SUBDRIVER
  M:    Frank Zago <frank@zago.net>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/finepix.c
  
  GSPCA GL860 SUBDRIVER
  M:    Olivier Lorin <o.lorin@laposte.net>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/gl860/
  
  GSPCA M5602 SUBDRIVER
  M:    Erik Andren <erik.andren@gmail.com>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/m5602/
  
  GSPCA PAC207 SONIXB SUBDRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/pac207.c
  
  GSPCA SN9C20X SUBDRIVER
  M:    Brian Johnson <brijohn@gmail.com>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/sn9c20x.c
  
  GSPCA T613 SUBDRIVER
  M:    Leandro Costantino <lcostantino@gmail.com>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/t613.c
  
@@@ -3059,7 -3021,7 +3059,7 @@@ GSPCA USB WEBCAM DRIVE
  M:    Jean-Francois Moine <moinejf@free.fr>
  W:    http://moinejf.free.fr
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/gspca/
  
@@@ -3345,7 -3307,7 +3345,7 @@@ IDE SUBSYSTE
  M:    "David S. Miller" <davem@davemloft.net>
  L:    linux-ide@vger.kernel.org
  Q:    http://patchwork.ozlabs.org/project/linux-ide/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git
  S:    Maintained
  F:    Documentation/ide/
  F:    drivers/ide/
@@@ -3457,7 -3419,7 +3457,7 @@@ F:      firmware/isci
  INTEL IDLE DRIVER
  M:    Len Brown <lenb@kernel.org>
  L:    linux-pm@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git
  S:    Supported
  F:    drivers/idle/intel_idle.c
  
@@@ -3703,15 -3665,6 +3703,15 @@@ S:    Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    kernel/irq/
  
 +IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 +M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
 +M:    Grant Likely <grant.likely@secretlab.ca>
 +T:    git git://git.secretlab.ca/git/linux-2.6.git irqdomain/next
 +S:    Maintained
 +F:    Documentation/IRQ-domain.txt
 +F:    include/linux/irqdomain.h
 +F:    kernel/irq/irqdomain.c
 +
  ISAPNP
  M:    Jaroslav Kysela <perex@perex.cz>
  S:    Maintained
@@@ -3764,7 -3717,7 +3764,7 @@@ IVTV VIDEO4LINUX DRIVE
  M:    Andy Walls <awalls@md.metrocast.net>
  L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.ivtvdriver.org
  S:    Maintained
  F:    Documentation/video4linux/*.ivtv
@@@ -3860,8 -3813,8 +3860,8 @@@ F:      fs/autofs4
  
  KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
  M:    Michal Marek <mmarek@suse.cz>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git for-next
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git rc-fixes
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git for-next
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git rc-fixes
  L:    linux-kbuild@vger.kernel.org
  S:    Maintained
  F:    Documentation/kbuild/
@@@ -4108,7 -4061,7 +4108,7 @@@ M:      Josh Boyer <jwboyer@gmail.com
  M:    Matt Porter <mporter@kernel.crashing.org>
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@lists.ozlabs.org
 -T:    git git://git.infradead.org/users/jwboyer/powerpc-4xx.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
  S:    Maintained
  F:    arch/powerpc/platforms/40x/
  F:    arch/powerpc/platforms/44x/
@@@ -4241,14 -4194,12 +4241,14 @@@ F:   Documentation/hwmon/ltc426
  F:    drivers/hwmon/ltc4261.c
  
  LTP (Linux Test Project)
 -M:    Rishikesh K Rajak <risrajak@linux.vnet.ibm.com>
 -M:    Garrett Cooper <yanegomi@gmail.com>
 +M:    Shubham Goyal <shubham@linux.vnet.ibm.com>
  M:    Mike Frysinger <vapier@gentoo.org>
 -M:    Subrata Modak <subrata@linux.vnet.ibm.com>
 +M:    Cyril Hrubis <chrubis@suse.cz>
 +M:    Caspar Zhang <caspar@casparzhang.com>
 +M:    Wanlong Gao <gaowanlong@cn.fujitsu.com>
  L:    ltp-list@lists.sourceforge.net (subscribers-only)
  W:    http://ltp.sourceforge.net/
 +T:    git git://github.com/linux-test-project/ltp.git
  T:    git git://ltp.git.sourceforge.net/gitroot/ltp/ltp-dev
  S:    Maintained
  
@@@ -4286,7 -4237,7 +4286,7 @@@ MAC8021
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
  W:    http://linuxwireless.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
  S:    Maintained
  F:    Documentation/networking/mac80211-injection.txt
  F:    include/net/mac80211.h
@@@ -4297,7 -4248,7 +4297,7 @@@ M:      Stefano Brivio <stefano.brivio@polim
  M:    Mattias Nissler <mattias.nissler@gmx.de>
  L:    linux-wireless@vger.kernel.org
  W:    http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
  S:    Maintained
  F:    net/mac80211/rc80211_pid*
  
@@@ -4369,7 -4320,7 +4369,7 @@@ P:      LinuxTV.org Projec
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
  Q:    http://patchwork.kernel.org/project/linux-media/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/dvb/
  F:    Documentation/video4linux/
@@@ -4426,13 -4377,6 +4426,13 @@@ T:    git git://git.monstr.eu/linux-2.6-mi
  S:    Supported
  F:    arch/microblaze/
  
 +MICROCHANNEL ARCHITECTURE (MCA)
 +M:    James Bottomley <James.Bottomley@HansenPartnership.com>
 +S:    Maintained
 +F:    Documentation/mca.txt
 +F:    drivers/mca/
 +F:    include/linux/mca*
 +
  MICROTEK X6 SCANNER
  M:    Oliver Neukum <oliver@neukum.name>
  S:    Maintained
@@@ -4448,6 -4392,14 +4448,6 @@@ S:     Supporte
  F:    Documentation/mips/
  F:    arch/mips/
  
 -MISCELLANEOUS MCA-SUPPORT
 -M:    James Bottomley <James.Bottomley@HansenPartnership.com>
 -S:    Maintained
 -F:    Documentation/ia64/mca.txt
 -F:    Documentation/mca.txt
 -F:    drivers/mca/
 -F:    include/linux/mca*
 -
  MODULE SUPPORT
  M:    Rusty Russell <rusty@rustcorp.com.au>
  S:    Maintained
@@@ -4655,7 -4607,7 +4655,7 @@@ M:      James Morris <jmorris@namei.org
  M:    Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
  M:    Patrick McHardy <kaber@trash.net>
  L:    netdev@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
  S:    Maintained
  F:    net/ipv4/
  F:    net/ipv6/
@@@ -4671,7 -4623,7 +4671,7 @@@ NETWORKING [WIRELESS
  M:    "John W. Linville" <linville@tuxdriver.com>
  L:    linux-wireless@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git
  S:    Maintained
  F:    net/mac80211/
  F:    net/rfkill/
@@@ -4684,8 -4636,8 +4684,8 @@@ F:      drivers/net/wireless
  NETWORKING DRIVERS
  L:    netdev@vger.kernel.org
  W:    http://www.linuxfoundation.org/en/Net
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
  S:    Odd Fixes
  F:    drivers/net/
  F:    include/linux/if_*
@@@ -4901,7 -4853,7 +4901,7 @@@ F:      drivers/char/pcmcia/cm4040_cs.
  OMNIVISION OV7670 SENSOR DRIVER
  M:    Jonathan Corbet <corbet@lwn.net>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    drivers/media/video/ov7670.c
  
@@@ -4985,6 -4937,8 +4985,6 @@@ F:      fs/ocfs2
  
  ORINOCO DRIVER
  L:    linux-wireless@vger.kernel.org
 -L:    orinoco-users@lists.sourceforge.net
 -L:    orinoco-devel@lists.sourceforge.net
  W:    http://linuxwireless.org/en/users/Drivers/orinoco
  W:    http://www.nongnu.org/orinoco/
  S:    Orphan
@@@ -5076,7 -5030,7 +5076,7 @@@ M:      Helge Deller <deller@gmx.de
  L:    linux-parisc@vger.kernel.org
  W:    http://www.parisc-linux.org/
  Q:    http://patchwork.kernel.org/project/linux-parisc/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git
  S:    Maintained
  F:    arch/parisc/
  F:    drivers/parisc/
@@@ -5129,17 -5083,17 +5129,17 @@@ F:   Documentation/PCI/pci-error-recovery
  F:    Documentation/powerpc/eeh-pci-error-recovery.txt
  
  PCI SUBSYSTEM
 -M:    Jesse Barnes <jbarnes@virtuousgeek.org>
 +M:    Bjorn Helgaas <bhelgaas@google.com>
  L:    linux-pci@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-pci/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci.git
  S:    Supported
  F:    Documentation/PCI/
  F:    drivers/pci/
  F:    include/linux/pci*
  
  PCI HOTPLUG
 -M:    Jesse Barnes <jbarnes@virtuousgeek.org>
 +M:    Bjorn Helgaas <bhelgaas@google.com>
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    drivers/pci/hotplug
@@@ -5391,17 -5345,6 +5391,17 @@@ L:    cbe-oss-dev@lists.ozlabs.or
  S:    Maintained
  F:    drivers/block/ps3vram.c
  
 +PTP HARDWARE CLOCK SUPPORT
 +M:    Richard Cochran <richardcochran@gmail.com>
 +S:    Maintained
 +W:    http://linuxptp.sourceforge.net/
 +F:    Documentation/ABI/testing/sysfs-ptp
 +F:    Documentation/ptp/*
 +F:    drivers/net/gianfar_ptp.c
 +F:    drivers/net/phy/dp83640*
 +F:    drivers/ptp/*
 +F:    include/linux/ptp_cl*
 +
  PTRACE SUPPORT
  M:    Roland McGrath <roland@redhat.com>
  M:    Oleg Nesterov <oleg@redhat.com>
@@@ -5417,7 -5360,7 +5417,7 @@@ M:      Mike Isely <isely@pobox.com
  L:    pvrusb2@isely.net       (subscribers-only)
  L:    linux-media@vger.kernel.org
  W:    http://www.isely.net/pvrusb2/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/README.pvrusb2
  F:    drivers/media/video/pvrusb2/
@@@ -5425,7 -5368,7 +5425,7 @@@
  PXA2xx/PXA3xx SUPPORT
  M:    Eric Miao <eric.y.miao@gmail.com>
  M:    Russell King <linux@arm.linux.org.uk>
 -M:    Haojian Zhuang <haojian.zhuang@marvell.com>
 +M:    Haojian Zhuang <haojian.zhuang@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://github.com/hzhuang1/linux.git
  T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
@@@ -5440,7 -5383,7 +5440,7 @@@ F:      sound/soc/px
  
  MMP SUPPORT
  M:    Eric Miao <eric.y.miao@gmail.com>
 -M:    Haojian Zhuang <haojian.zhuang@marvell.com>
 +M:    Haojian Zhuang <haojian.zhuang@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://github.com/hzhuang1/linux.git
  T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
@@@ -5583,7 -5526,7 +5583,7 @@@ RCUTORTURE MODUL
  M:    Josh Triplett <josh@freedesktop.org>
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
  F:    Documentation/RCU/torture.txt
  F:    kernel/rcutorture.c
  
@@@ -5608,7 -5551,7 +5608,7 @@@ M:      Dipankar Sarma <dipankar@in.ibm.com
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  W:    http://www.rdrop.com/users/paulmck/rclock/
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
  F:    Documentation/RCU/
  F:    include/linux/rcu*
  F:    include/linux/srcu*
@@@ -5637,13 -5580,6 +5637,13 @@@ S:    Supporte
  F:    drivers/base/regmap/
  F:    include/linux/regmap.h
  
 +REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
 +M:    Ohad Ben-Cohen <ohad@wizery.com>
 +S:    Maintained
 +F:    drivers/remoteproc/
 +F:    Documentation/remoteproc.txt
 +F:    include/linux/remoteproc.txt
 +
  RFKILL
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
@@@ -5769,13 -5705,19 +5769,19 @@@ F:   drivers/mmc/host/s3cmci.
  SAA7146 VIDEO4LINUX-2 DRIVER
  M:    Michael Hunold <michael@mihu.de>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.mihu.de/linux/saa7146
  S:    Maintained
  F:    drivers/media/common/saa7146*
  F:    drivers/media/video/*7146*
  F:    include/media/*7146*
  
+ SAMSUNG LAPTOP DRIVER
+ M:    Corentin Chary <corentincj@iksaif.net>
+ L:    platform-driver-x86@vger.kernel.org
+ S:    Maintained
+ F:    drivers/platform/x86/samsung-laptop.c
+ 
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Sangbeom Kim <sbkim73@samsung.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -6074,8 -6016,7 +6080,8 @@@ F:      arch/arm/mach-s3c2410/bast-irq.
  TI DAVINCI MACHINE SUPPORT
  M:    Sekhar Nori <nsekhar@ti.com>
  M:    Kevin Hilman <khilman@ti.com>
 -L:    davinci-linux-open-source@linux.davincidsp.com (subscribers-only)
 +L:    davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)
 +T:    git git://gitorious.org/linux-davinci/linux-davinci.git
  Q:    http://patchwork.kernel.org/project/linux-davinci/list/
  S:    Supported
  F:    arch/arm/mach-davinci
@@@ -6193,7 -6134,7 +6199,7 @@@ F:      arch/ia64/sn
  SOC-CAMERA V4L2 SUBSYSTEM
  M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    include/media/v4l2*
  F:    drivers/media/video/v4l2*
@@@ -6265,8 -6206,8 +6271,8 @@@ SPARC + UltraSPARC (sparc/sparc64
  M:    "David S. Miller" <davem@davemloft.net>
  L:    sparclinux@vger.kernel.org
  Q:    http://patchwork.ozlabs.org/project/sparclinux/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git
  S:    Maintained
  F:    arch/sparc/
  F:    drivers/sbus/
@@@ -6274,11 -6215,11 +6280,11 @@@
  SPARC SERIAL DRIVERS
  M:    "David S. Miller" <davem@davemloft.net>
  L:    sparclinux@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git
  S:    Maintained
 +F:    include/linux/sunserialcore.h
  F:    drivers/tty/serial/suncore.c
 -F:    drivers/tty/serial/suncore.h
  F:    drivers/tty/serial/sunhv.c
  F:    drivers/tty/serial/sunsab.c
  F:    drivers/tty/serial/sunsab.h
@@@ -6460,11 -6401,6 +6466,11 @@@ W:    http://wiki.laptop.org/go/DCO
  S:    Odd Fixes
  F:    drivers/staging/olpc_dcon/
  
 +STAGING - OZMO DEVICES USB OVER WIFI DRIVER
 +M:    Chris Kelly <ckelly@ozmodevices.com>
 +S:    Maintained
 +F:    drivers/staging/ozwpan/
 +
  STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER
  M:    Willy Tarreau <willy@meta-x.org>
  S:    Odd Fixes
@@@ -6580,7 -6516,7 +6586,7 @@@ L:      linux-scsi@vger.kernel.or
  L:    target-devel@vger.kernel.org
  L:    http://groups.google.com/group/linux-iscsi-target-dev
  W:    http://www.linux-iscsi.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core-2.6.git master
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core.git master
  S:    Supported
  F:    drivers/target/
  F:    include/target/
@@@ -6618,10 -6554,9 +6624,10 @@@ F:    include/linux/if_team.
  TEGRA SUPPORT
  M:    Colin Cross <ccross@android.com>
  M:    Olof Johansson <olof@lixom.net>
 -M:    Stephen Warren <swarren@nvidia.com>
 +M:    Stephen Warren <swarren@wwwdotorg.org>
  L:    linux-tegra@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git
 +Q:    http://patchwork.ozlabs.org/project/linux-tegra/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
  S:    Supported
  F:    arch/arm/mach-tegra
  
@@@ -6772,7 -6707,7 +6778,7 @@@ K:      ^Subject:.*(?i)trivia
  TTY LAYER
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:    Supported
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
  F:    drivers/tty/
  F:    drivers/tty/serial/serial_core.c
  F:    include/linux/serial_core.h
@@@ -6940,7 -6875,7 +6946,7 @@@ USB ET61X[12]51 DRIVE
  M:    Luca Risolia <luca.risolia@studio.unibo.it>
  L:    linux-usb@vger.kernel.org
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.linux-projects.org
  S:    Maintained
  F:    drivers/media/video/et61x251/
@@@ -7096,7 -7031,7 +7102,7 @@@ USB SN9C1xx DRIVE
  M:    Luca Risolia <luca.risolia@studio.unibo.it>
  L:    linux-usb@vger.kernel.org
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.linux-projects.org
  S:    Maintained
  F:    Documentation/video4linux/sn9c102.txt
@@@ -7106,7 -7041,7 +7112,7 @@@ USB SUBSYSTE
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    linux-usb@vger.kernel.org
  W:    http://www.linux-usb.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
  S:    Supported
  F:    Documentation/usb/
  F:    drivers/net/usb/
@@@ -7132,7 -7067,7 +7138,7 @@@ USB VIDEO CLAS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-uvc-devel@lists.berlios.de (subscribers-only)
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.ideasonboard.org/uvc/
  S:    Maintained
  F:    drivers/media/video/uvc/
@@@ -7141,7 -7076,7 +7147,7 @@@ USB W996[87]CF DRIVE
  M:    Luca Risolia <luca.risolia@studio.unibo.it>
  L:    linux-usb@vger.kernel.org
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.linux-projects.org
  S:    Maintained
  F:    Documentation/video4linux/w9968cf.txt
@@@ -7170,7 -7105,7 +7176,7 @@@ USB ZR364XX DRIVE
  M:    Antoine Jacquet <royale@zerezo.com>
  L:    linux-usb@vger.kernel.org
  L:    linux-media@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://royale.zerezo.com/zr364xx/
  S:    Maintained
  F:    Documentation/video4linux/zr364xx.txt
@@@ -7320,7 -7255,7 +7326,7 @@@ M:      Liam Girdwood <lrg@ti.com
  M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
  W:    http://opensource.wolfsonmicro.com/node/15
  W:    http://www.slimlogic.co.uk/?p=48
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/regulator.git
  S:    Supported
  F:    drivers/regulator/
  F:    include/linux/regulator/
@@@ -7567,12 -7502,6 +7573,12 @@@ S:    Supporte
  F:    Documentation/filesystems/xfs.txt
  F:    fs/xfs/
  
 +XILINX AXI ETHERNET DRIVER
 +M:    Ariane Keller <ariane.keller@tik.ee.ethz.ch>
 +M:    Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
 +S:    Maintained
 +F:    drivers/net/ethernet/xilinx/xilinx_axienet*
 +
  XILINX SYSTEMACE DRIVER
  M:    Grant Likely <grant.likely@secretlab.ca>
  W:    http://www.secretlab.ca/

diff --combined arch/x86/Kconfig
index 90195235596943ff7fbb3b87a695eca988c5c9b8,3a38c4c1d359d5813c143e9d6b2319087a9dc449..3ad653de7100014100f91705f5dfb820bf433152
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -82,7 -82,6 +82,7 @@@ config X8
        select CLKEVT_I8253
        select ARCH_HAVE_NMI_SAFE_CMPXCHG
        select GENERIC_IOMAP
 +      select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC
  
  config INSTRUCTION_DECODER
        def_bool (KPROBES || PERF_EVENTS)
@@@ -180,9 -179,6 +180,9 @@@ config ARCH_HAS_DEFAULT_IDL
  config ARCH_HAS_CACHE_LINE_SIZE
        def_bool y
  
 +config ARCH_HAS_CPU_AUTOPROBE
 +      def_bool y
 +
  config HAVE_SETUP_PER_CPU_AREA
        def_bool y
  
@@@ -402,7 -398,6 +402,7 @@@ config X86_INTEL_C
        select X86_REBOOTFIXUPS
        select OF
        select OF_EARLY_FLATTREE
 +      select IRQ_DOMAIN
        ---help---
          Select for the Intel CE media processor (CE4100) SOC.
          This option compiles in support for the CE4100 SOC for settop
@@@ -422,6 -417,27 +422,6 @@@ if X86_WANT_INTEL_MI
  config X86_INTEL_MID
        bool
  
 -config X86_MRST
 -       bool "Moorestown MID platform"
 -      depends on PCI
 -      depends on PCI_GOANY
 -      depends on X86_IO_APIC
 -      select X86_INTEL_MID
 -      select SFI
 -      select DW_APB_TIMER
 -      select APB_TIMER
 -      select I2C
 -      select SPI
 -      select INTEL_SCU_IPC
 -      select X86_PLATFORM_DEVICES
 -      ---help---
 -        Moorestown is Intel's Low Power Intel Architecture (LPIA) based Moblin
 -        Internet Device(MID) platform. Moorestown consists of two chips:
 -        Lincroft (CPU core, graphics, and memory controller) and Langwell IOH.
 -        Unlike standard x86 PCs, Moorestown does not have many legacy devices
 -        nor standard legacy replacement devices/features. e.g. Moorestown does
 -        not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.
 -
  config X86_MDFLD
         bool "Medfield MID platform"
        depends on PCI
@@@ -435,7 -451,6 +435,7 @@@
        select SPI
        select INTEL_SCU_IPC
        select X86_PLATFORM_DEVICES
 +      select MFD_INTEL_MSIC
        ---help---
          Medfield is Intel's Low Power Intel Architecture (LPIA) based Moblin
          Internet Device(MID) platform. 
@@@ -2061,7 -2076,6 +2061,7 @@@ config OLP
        select GPIOLIB
        select OF
        select OF_PROMTREE
 +      select IRQ_DOMAIN
        ---help---
          Add support for detecting the unique features of the OLPC
          XO hardware.
@@@ -2119,12 -2133,13 +2119,19 @@@ config ALI
  
          Note: You have to set alix.force=1 for boards with Award BIOS.
  
 +config NET5501
 +      bool "Soekris Engineering net5501 System Support (LEDS, GPIO, etc)"
 +      select GPIOLIB
 +      ---help---
 +        This option enables system support for the Soekris Engineering net5501.
 +
+ config GEOS
+       bool "Traverse Technologies GEOS System Support (LEDS, GPIO, etc)"
+       select GPIOLIB
+       depends on DMI
+       ---help---
+         This option enables system support for the Traverse Technologies GEOS.
+ 
  endif # X86_32
  
  config AMD_NB

diff --combined arch/x86/platform/geode/Makefile
index 246b788847ff727dd7fcca9d120e77ba56fe23a6,d8ba5644f2f6c6c853adbc3ec35ede2d19b2be8e..5b51194f4c8d1569d57155f134abfd7204efdb48
--- 1/arch/x86/platform/geode/Makefile
--- 2/arch/x86/platform/geode/Makefile
+++ b/arch/x86/platform/geode/Makefile
@@@ -1,2 -1,2 +1,3 @@@
  obj-$(CONFIG_ALIX)            += alix.o
 +obj-$(CONFIG_NET5501)         += net5501.o
+ obj-$(CONFIG_GEOS)            += geos.o

diff --combined drivers/platform/x86/asus-wmi.c
index 9929246895deb386a75dd08b00722f0424257595,7d1684bdbf63ab0f7c151b7da87d8d7883d462e2..77aadde5281c97ae423e35f5255c7e9b63d36b70
--- 1/drivers/platform/x86/asus-wmi.c
--- 2/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@@ -411,7 -411,7 +411,7 @@@ static int kbd_led_read(struct asus_wm
  
        if (retval >= 0) {
                if (level)
-                       *level = retval & 0x80 ? retval & 0x7F : 0;
+                       *level = retval & 0x7F;
                if (env)
                        *env = (retval >> 8) & 0x7F;
                retval = 0;
@@@ -571,7 -571,7 +571,7 @@@ static void asus_rfkill_hotplug(struct 
                } else {
                        dev = pci_get_slot(bus, 0);
                        if (dev) {
 -                              pci_remove_bus_device(dev);
 +                              pci_stop_and_remove_bus_device(dev);
                                pci_dev_put(dev);
                        }
                }
@@@ -784,7 -784,8 +784,8 @@@ static int asus_new_rfkill(struct asus_
        arfkill->dev_id = dev_id;
        arfkill->asus = asus;
  
-       if (dev_id == ASUS_WMI_DEVID_WLAN && asus->driver->hotplug_wireless)
+       if (dev_id == ASUS_WMI_DEVID_WLAN &&
+           asus->driver->quirks->hotplug_wireless)
                *rfkill = rfkill_alloc(name, &asus->platform_device->dev, type,
                                       &asus_rfkill_wlan_ops, arfkill);
        else
@@@ -895,7 -896,7 +896,7 @@@ static int asus_wmi_rfkill_init(struct 
        if (result && result != -ENODEV)
                goto exit;
  
-       if (!asus->driver->hotplug_wireless)
+       if (!asus->driver->quirks->hotplug_wireless)
                goto exit;
  
        result = asus_setup_pci_hotplug(asus);
@@@ -1075,7 -1076,12 +1076,12 @@@ static int asus_wmi_hwmon_init(struct a
   */
  static int read_backlight_power(struct asus_wmi *asus)
  {
-       int ret = asus_wmi_get_devstate_simple(asus, ASUS_WMI_DEVID_BACKLIGHT);
+       int ret;
+       if (asus->driver->quirks->store_backlight_power)
+               ret = !asus->driver->panel_power;
+       else
+               ret = asus_wmi_get_devstate_simple(asus,
+                                                  ASUS_WMI_DEVID_BACKLIGHT);
  
        if (ret < 0)
                return ret;
@@@ -1116,26 -1122,51 +1122,51 @@@ static int read_brightness(struct backl
        return retval & ASUS_WMI_DSTS_BRIGHTNESS_MASK;
  }
  
- static int update_bl_status(struct backlight_device *bd)
+ static u32 get_scalar_command(struct backlight_device *bd)
  {
        struct asus_wmi *asus = bl_get_data(bd);
-       u32 ctrl_param;
-       int power, err;
+       u32 ctrl_param = 0;
  
-       ctrl_param = bd->props.brightness;
+       if ((asus->driver->brightness < bd->props.brightness) ||
+           bd->props.brightness == bd->props.max_brightness)
+               ctrl_param = 0x00008001;
+       else if ((asus->driver->brightness > bd->props.brightness) ||
+                bd->props.brightness == 0)
+               ctrl_param = 0x00008000;
  
-       err = asus_wmi_set_devstate(ASUS_WMI_DEVID_BRIGHTNESS,
-                                   ctrl_param, NULL);
+       asus->driver->brightness = bd->props.brightness;
  
-       if (err < 0)
-               return err;
+       return ctrl_param;
+ }
+ 
+ static int update_bl_status(struct backlight_device *bd)
+ {
+       struct asus_wmi *asus = bl_get_data(bd);
+       u32 ctrl_param;
+       int power, err = 0;
  
        power = read_backlight_power(asus);
        if (power != -ENODEV && bd->props.power != power) {
                ctrl_param = !!(bd->props.power == FB_BLANK_UNBLANK);
                err = asus_wmi_set_devstate(ASUS_WMI_DEVID_BACKLIGHT,
                                            ctrl_param, NULL);
+               if (asus->driver->quirks->store_backlight_power)
+                       asus->driver->panel_power = bd->props.power;
+ 
+               /* When using scalar brightness, updating the brightness
+                * will mess with the backlight power */
+               if (asus->driver->quirks->scalar_panel_brightness)
+                       return err;
        }
+ 
+       if (asus->driver->quirks->scalar_panel_brightness)
+               ctrl_param = get_scalar_command(bd);
+       else
+               ctrl_param = bd->props.brightness;
+ 
+       err = asus_wmi_set_devstate(ASUS_WMI_DEVID_BRIGHTNESS,
+                                   ctrl_param, NULL);
+ 
        return err;
  }
  
@@@ -1196,10 -1227,15 +1227,15 @@@ static int asus_wmi_backlight_init(stru
  
        asus->backlight_device = bd;
  
+       if (asus->driver->quirks->store_backlight_power)
+               asus->driver->panel_power = power;
+ 
        bd->props.brightness = read_brightness(bd);
        bd->props.power = power;
        backlight_update_status(bd);
  
+       asus->driver->brightness = bd->props.brightness;
+ 
        return 0;
  }
  
@@@ -1441,9 -1477,9 +1477,9 @@@ static int asus_wmi_platform_init(struc
  
        /* CWAP allow to define the behavior of the Fn+F2 key,
         * this method doesn't seems to be present on Eee PCs */
-       if (asus->driver->wapf >= 0)
+       if (asus->driver->quirks->wapf >= 0)
                asus_wmi_set_devstate(ASUS_WMI_DEVID_CWAP,
-                                     asus->driver->wapf, NULL);
+                                     asus->driver->quirks->wapf, NULL);
  
        return asus_wmi_sysfs_init(asus->platform_device);
  }
@@@ -1622,8 -1658,8 +1658,8 @@@ static int asus_wmi_add(struct platform
        wdrv->platform_device = pdev;
        platform_set_drvdata(asus->platform_device, asus);
  
-       if (wdrv->quirks)
-               wdrv->quirks(asus->driver);
+       if (wdrv->detect_quirks)
+               wdrv->detect_quirks(asus->driver);
  
        err = asus_wmi_platform_init(asus);
        if (err)

diff --combined drivers/platform/x86/eeepc-laptop.c
index d9a9e2bedb30311f9423adc276c29d19c47503f5,6deb0d7f226336f98fda7d1c2079ed2caa3655e5..dab91b48d22cf5fbb955efd7ecb5fc0f6fa318c1
--- 1/drivers/platform/x86/eeepc-laptop.c
--- 2/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@@ -646,7 -646,7 +646,7 @@@ static void eeepc_rfkill_hotplug(struc
                } else {
                        dev = pci_get_slot(bus, 0);
                        if (dev) {
 -                              pci_remove_bus_device(dev);
 +                              pci_stop_and_remove_bus_device(dev);
                                pci_dev_put(dev);
                        }
                }
@@@ -1251,6 -1251,14 +1251,14 @@@ static void eeepc_input_exit(struct eee
  /*
   * ACPI driver
   */
+ static void eeepc_input_notify(struct eeepc_laptop *eeepc, int event)
+ {
+       if (!eeepc->inputdev)
+               return ;
+       if (!sparse_keymap_report_event(eeepc->inputdev, event, 1, true))
+               pr_info("Unknown key %x pressed\n", event);
+ }
+ 
  static void eeepc_acpi_notify(struct acpi_device *device, u32 event)
  {
        struct eeepc_laptop *eeepc = acpi_driver_data(device);
@@@ -1287,12 -1295,11 +1295,11 @@@
                                * event will be desired value (or else ignored)
                                */
                        }
-                       sparse_keymap_report_event(eeepc->inputdev, event,
-                                                  1, true);
+                       eeepc_input_notify(eeepc, event);
                }
        } else {
                /* Everything else is a bona-fide keypress event */
-               sparse_keymap_report_event(eeepc->inputdev, event, 1, true);
+               eeepc_input_notify(eeepc, event);
        }
  }
  

diff --combined drivers/platform/x86/intel_mid_thermal.c
index 2ee9766737ea413d56e82d581444c64f1b696801,acd7d2d3d9126aa5f2822a28dd3c59b3e312028d..5ae9cd9c7e6e10f4da2dc254725f397286598731
--- 1/drivers/platform/x86/intel_mid_thermal.c
--- 2/drivers/platform/x86/intel_mid_thermal.c
+++ b/drivers/platform/x86/intel_mid_thermal.c
@@@ -545,10 -545,11 +545,11 @@@ static int mid_thermal_remove(struct pl
        return configure_adc(0);
  }
  
 -#define DRIVER_NAME "msic_sensor"
 +#define DRIVER_NAME "msic_thermal"
  
  static const struct platform_device_id therm_id_table[] = {
        { DRIVER_NAME, 1 },
+       { "msic_thermal", 1 },
        { }
  };
  
@@@ -564,18 -565,7 +565,7 @@@ static struct platform_driver mid_therm
        .id_table = therm_id_table,
  };
  
- static int __init mid_thermal_module_init(void)
- {
-       return platform_driver_register(&mid_thermal_driver);
- }
- 
- static void __exit mid_thermal_module_exit(void)
- {
-       platform_driver_unregister(&mid_thermal_driver);
- }
- 
- module_init(mid_thermal_module_init);
- module_exit(mid_thermal_module_exit);
+ module_platform_driver(mid_thermal_driver);
  
  MODULE_AUTHOR("Durgadoss R <durgadoss.r@intel.com>");
  MODULE_DESCRIPTION("Intel Medfield Platform Thermal Driver");