Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (23 commits)
  hwmon: Remove the deprecated adt7473 driver
  hwmon: Fix off-by-one kind values
  hwmon: (tmp421) Fix temperature conversions
  hwmon: (tmp421) Restore missing inputs
  hwmon: Driver for Andigilog aSC7621 family monitoring chips
  hwmon: (adt7411) Improve locking
  hwmon: Add driver for ADT7411 voltage and temperature sensor
  hwmon: (w83793) Add watchdog functionality
  hwmon: (g760a) Make rpm_from_cnt static
  hwmon: (it87) Validate auto pwm settings
  hwmon: (it87) Add support for old automatic fan speed control
  hwmon: (it87) Drop dead web links in documentation
  hwmon: (it87) Add an entry in MAINTAINERS
  hwmon: (it87) Use strict_strtol instead of simple_strtol
  hwmon: (it87) Fix many checkpatch errors and warnings
  hwmon: (it87) Add support for beep on alarm
  hwmon: (it87) Create vid attributes by group
  hwmon: (it87) Refactor attributes creation and removal
  hwmon: (it87) Expose the PWM/temperature mappings
  hwmon: (it87) Display fan outputs in automatic mode as such
  ...

diff --combined Documentation/feature-removal-schedule.txt
index 31575e2,8debdd6..a5cc0db
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -449,12 -449,6 +449,6 @@@ Who:      Alok N Kataria <akataria@vmware.co
  
  ----------------------------
  
- What: adt7473 hardware monitoring driver
- When: February 2010
- Why:  Obsoleted by the adt7475 driver.
- Who:  Jean Delvare <khali@linux-fr.org>
- 
- ---------------------------
  What: Support for lcd_switch and display_get in asus-laptop driver
  When: March 2010
  Why:  These two features use non-standard interfaces. There are the
@@@ -556,35 -550,3 +550,35 @@@ Why:     udev fully replaces this special f
        NCCI TTY device nodes. User space (pppdcapiplugin) works without
        noticing the difference.
  Who:  Jan Kiszka <jan.kiszka@web.de>
 +
 +----------------------------
 +
 +What: KVM memory aliases support
 +When: July 2010
 +Why:  Memory aliasing support is used for speeding up guest vga access
 +      through the vga windows.
 +
 +      Modern userspace no longer uses this feature, so it's just bitrotted
 +      code and can be removed with no impact.
 +Who:  Avi Kivity <avi@redhat.com>
 +
 +----------------------------
 +
 +What: KVM kernel-allocated memory slots
 +When: July 2010
 +Why:  Since 2.6.25, kvm supports user-allocated memory slots, which are
 +      much more flexible than kernel-allocated slots.  All current userspace
 +      supports the newer interface and this code can be removed with no
 +      impact.
 +Who:  Avi Kivity <avi@redhat.com>
 +
 +----------------------------
 +
 +What: KVM paravirt mmu host support
 +When: January 2011
 +Why:  The paravirt mmu host support is slower than non-paravirt mmu, both
 +      on newer and older hardware.  It is already not exposed to the guest,
 +      and kept only for live migration purposes.
 +Who:  Avi Kivity <avi@redhat.com>
 +
 +----------------------------

diff --combined MAINTAINERS
index e0d5c1a,d6cbddb..bfa4fd1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -71,7 -71,6 +71,7 @@@ Descriptions of section entries
        M: Mail patches to: FullName <address@domain>
        L: Mailing list that is relevant to this area
        W: Web-page with status/info
 +      Q: Patchwork web based patch tracking system site
        T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.
        S: Status, one of the following:
           Supported:   Someone is actually paid to look after this.
@@@ -183,7 -182,6 +183,7 @@@ M: Ron Minnich <rminnich@sandia.gov
  M:    Latchesar Ionkov <lucho@ionkov.net>
  L:    v9fs-developer@lists.sourceforge.net
  W:    http://swik.net/v9fs
 +Q:    http://patchwork.kernel.org/project/v9fs-devel/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
  S:    Maintained
  F:    Documentation/filesystems/9p.txt
@@@ -240,7 -238,6 +240,7 @@@ ACP
  M:    Len Brown <lenb@kernel.org>
  L:    linux-acpi@vger.kernel.org
  W:    http://www.lesswatts.org/projects/acpi/
 +Q:    http://patchwork.kernel.org/project/linux-acpi/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
  S:    Supported
  F:    drivers/acpi/
@@@ -431,6 -428,7 +431,6 @@@ P: Jordan Crous
  L:    linux-geode@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
  S:    Supported
 -F:    arch/x86/kernel/geode_32.c
  F:    drivers/char/hw_random/geode-rng.c
  F:    drivers/crypto/geode*
  F:    drivers/video/geode/
@@@ -968,6 -966,13 +968,13 @@@ W:       http://www.arm.linux.org.uk
  S:    Maintained
  F:    arch/arm/vfp/
  
+ ASC7621 HARDWARE MONITOR DRIVER
+ M:    George Joseph <george.joseph@fairview5.com>
+ L:    lm-sensors@lm-sensors.org
+ S:    Maintained
+ F:    Documentation/hwmon/asc7621
+ F:    drivers/hwmon/asc7621.c
+ 
  ASUS ACPI EXTRAS DRIVER
  M:    Corentin Chary <corentincj@iksaif.net>
  M:    Karol Kozimor <sziwan@users.sourceforge.net>
@@@ -1334,7 -1339,6 +1341,7 @@@ BTRFS FILE SYSTE
  M:    Chris Mason <chris.mason@oracle.com>
  L:    linux-btrfs@vger.kernel.org
  W:    http://btrfs.wiki.kernel.org/
 +Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git
  S:    Maintained
  F:    Documentation/filesystems/btrfs.txt
@@@ -1499,7 -1503,6 +1506,7 @@@ M:      Steve French <sfrench@samba.org
  L:    linux-cifs-client@lists.samba.org (moderated for non-subscribers)
  L:    samba-technical@lists.samba.org (moderated for non-subscribers)
  W:    http://linux-cifs.samba.org/
 +Q:    http://patchwork.ozlabs.org/project/linux-cifs-client/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
  S:    Supported
  F:    Documentation/filesystems/cifs.txt
@@@ -1786,7 -1789,6 +1793,7 @@@ DEVICE-MAPPER  (LVM
  P:    Alasdair Kergon
  L:    dm-devel@redhat.com
  W:    http://sources.redhat.com/dm
 +Q:    http://patchwork.kernel.org/project/dm-devel/list/
  S:    Maintained
  F:    Documentation/device-mapper/
  F:    drivers/md/dm*
@@@ -2131,7 -2133,6 +2138,7 @@@ M:      "Theodore Ts'o" <tytso@mit.edu
  M:    Andreas Dilger <adilger@sun.com>
  L:    linux-ext4@vger.kernel.org
  W:    http://ext4.wiki.kernel.org
 +Q:    http://patchwork.ozlabs.org/project/linux-ext4/list/
  S:    Maintained
  F:    Documentation/filesystems/ext4.txt
  F:    fs/ext4/
@@@ -2508,6 -2509,13 +2515,6 @@@ L:     linux-parisc@vger.kernel.or
  S:    Maintained
  F:    sound/parisc/harmony.*
  
 -HAYES ESP SERIAL DRIVER
 -M:    "Andrew J. Robinson" <arobinso@nyx.net>
 -W:    http://www.nyx.net/~arobinso
 -S:    Maintained
 -F:    Documentation/serial/hayes-esp.txt
 -F:    drivers/char/esp.c
 -
  HEWLETT-PACKARD SMART2 RAID DRIVER
  M:    Chirag Kantharia <chirag.kantharia@hp.com>
  L:    iss_storagedev@hp.com
@@@ -2716,7 -2724,6 +2723,7 @@@ F:      drivers/scsi/ips.
  IDE SUBSYSTEM
  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
  S:    Maintained
  F:    Documentation/ide/
@@@ -2771,7 -2778,6 +2778,7 @@@ M:      Sean Hefty <sean.hefty@intel.com
  M:    Hal Rosenstock <hal.rosenstock@gmail.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.openib.org/
 +Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git
  S:    Supported
  F:    Documentation/infiniband/
@@@ -2791,7 -2797,6 +2798,7 @@@ INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCH
  M:    Dmitry Torokhov <dmitry.torokhov@gmail.com>
  M:    Dmitry Torokhov <dtor@mail.ru>
  L:    linux-input@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-input/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
  S:    Maintained
  F:    drivers/input/
@@@ -3048,6 -3053,13 +3055,13 @@@ W:    http://www.melware.d
  S:    Maintained
  F:    drivers/isdn/hardware/eicon/
  
+ IT87 HARDWARE MONITORING DRIVER
+ M:    Jean Delvare <khali@linux-fr.org>
+ L:    lm-sensors@lm-sensors.org
+ S:    Maintained
+ F:    Documentation/hwmon/it87
+ F:    drivers/hwmon/it87.c
+ 
  IVTV VIDEO4LINUX DRIVER
  M:    Andy Walls <awalls@radix.net>
  L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
@@@ -3101,7 -3113,6 +3115,7 @@@ F:      drivers/hwmon/k8temp.
  KCONFIG
  M:    Roman Zippel <zippel@linux-m68k.org>
  L:    linux-kbuild@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-kbuild/list/
  S:    Maintained
  F:    Documentation/kbuild/kconfig-language.txt
  F:    scripts/kconfig/
@@@ -3176,7 -3187,7 +3190,7 @@@ F:      arch/x86/include/asm/svm.
  F:    arch/x86/kvm/svm.c
  
  KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
 -M:    Hollis Blanchard <hollisb@us.ibm.com>
 +M:    Alexander Graf <agraf@suse.de>
  L:    kvm-ppc@vger.kernel.org
  W:    http://kvm.qumranet.com
  S:    Supported
@@@ -3315,7 -3326,6 +3329,7 @@@ M:      Benjamin Herrenschmidt <benh@kernel.
  M:    Paul Mackerras <paulus@samba.org>
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@ozlabs.org
 +Q:    http://patchwork.ozlabs.org/project/linuxppc-dev/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
  S:    Supported
  F:    Documentation/powerpc/
@@@ -3572,7 -3582,6 +3586,7 @@@ M:      Mauro Carvalho Chehab <mchehab@infra
  P:    LinuxTV.org Project
  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
  S:    Maintained
  F:    Documentation/dvb/
@@@ -3608,9 -3617,8 +3622,9 @@@ F:      mm/memcontrol.
  
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <dwmw2@infradead.org>
 -W:    http://www.linux-mtd.infradead.org/
  L:    linux-mtd@lists.infradead.org
 +W:    http://www.linux-mtd.infradead.org/
 +Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  T:    git git://git.infradead.org/mtd-2.6.git
  S:    Maintained
  F:    drivers/mtd/
@@@ -3870,7 -3878,6 +3884,7 @@@ S:      Maintaine
  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
  S:    Maintained
  F:    net/mac80211/
@@@ -3963,7 -3970,6 +3977,7 @@@ M:      Tony Lindgren <tony@atomide.com
  L:    linux-omap@vger.kernel.org
  W:    http://www.muru.com/linux/omap/
  W:    http://linux.omap.com/
 +Q:    http://patchwork.kernel.org/project/linux-omap/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
  S:    Maintained
  F:    arch/arm/*omap*/
@@@ -4190,7 -4196,6 +4204,7 @@@ M:      Helge Deller <deller@gmx.de
  M:    "James E.J. Bottomley" <jejb@parisc-linux.org>
  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
  S:    Maintained
  F:    arch/parisc/
@@@ -4233,7 -4238,6 +4247,7 @@@ F:      Documentation/powerpc/eeh-pci-error-
  PCI SUBSYSTEM
  M:    Jesse Barnes <jbarnes@virtuousgeek.org>
  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
  S:    Supported
  F:    Documentation/PCI/
@@@ -4275,9 -4279,7 +4289,9 @@@ M:      Ingo Molnar <mingo@elte.hu
  S:    Supported
  F:    kernel/perf_event.c
  F:    include/linux/perf_event.h
 -F:    arch/*/*/kernel/perf_event.c
 +F:    arch/*/kernel/perf_event.c
 +F:    arch/*/kernel/*/perf_event.c
 +F:    arch/*/kernel/*/*/perf_event.c
  F:    arch/*/include/asm/perf_event.h
  F:    arch/*/lib/perf_event.c
  F:    arch/*/kernel/perf_callchain.c
@@@ -4611,7 -4613,6 +4625,7 @@@ F:      include/linux/rtc.
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <a.zummo@towertech.it>
  L:    rtc-linux@googlegroups.com
 +Q:    http://patchwork.ozlabs.org/project/rtc-linux/list/
  S:    Maintained
  F:    Documentation/rtc.txt
  F:    drivers/rtc/
@@@ -4979,7 -4980,6 +4993,7 @@@ F:      drivers/*/*/*s3c2410
  TI DAVINCI MACHINE SUPPORT
  P:    Kevin Hilman
  M:    davinci-linux-open-source@linux.davincidsp.com
 +Q:    http://patchwork.kernel.org/project/linux-davinci/list/
  S:    Supported
  F:    arch/arm/mach-davinci
  
@@@ -5145,7 -5145,6 +5159,7 @@@ F:      include/sound/soc
  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
  S:    Maintained
@@@ -5161,7 -5160,6 +5175,7 @@@ SPI SUBSYSTE
  M:    David Brownell <dbrownell@users.sourceforge.net>
  M:    Grant Likely <grant.likely@secretlab.ca>
  L:    spi-devel-general@lists.sourceforge.net
 +Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
  S:    Maintained
  F:    Documentation/spi/
  F:    drivers/spi/
@@@ -5217,7 -5215,7 +5231,7 @@@ F:      drivers/net/starfire
  
  STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
  S:    Orphan
 -F:    drivers/net/wireless/strip.c
 +F:    drivers/staging/strip/strip.c
  F:    include/linux/if_strip.h
  
  STRADIS MPEG-2 DECODER DRIVER
@@@ -5238,7 -5236,6 +5252,7 @@@ SUPER
  M:    Paul Mundt <lethal@linux-sh.org>
  L:    linux-sh@vger.kernel.org
  W:    http://www.linux-sh.org
 +Q:    http://patchwork.kernel.org/project/linux-sh/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
  S:    Supported
  F:    Documentation/sh/
@@@ -6006,7 -6003,7 +6020,7 @@@ L:      linux-wireless@vger.kernel.or
  W:    http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
  S:    Maintained
  F:    Documentation/networking/wavelan.txt
 -F:    drivers/net/wireless/wavelan*
 +F:    drivers/staging/wavelan/
  
  WD7000 SCSI DRIVER
  M:    Miroslav Zagorac <zaga@fly.cc.fer.hr>
@@@ -6202,7 -6199,6 +6216,7 @@@ F:      drivers/serial/zs.
  THE REST
  M:    Linus Torvalds <torvalds@linux-foundation.org>
  L:    linux-kernel@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/LKML/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
  S:    Buried alive in reporters
  F:    *