Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: (53 commits)
  hwmon: (vt8231) fix sparse warning
  hwmon: (sis5595) fix sparse warning
  hwmon: (w83627hf) don't assume bank 0
  hwmon: (w83627hf) Fix setting fan min right after driver load
  hwmon: (w83627hf) De-macro sysfs callback functions
  hwmon: Add new combined driver for FSC chips
  hwmon: (ibmpex) Release IPMI user if hwmon registration fails
  hwmon: (dme1737) Add sch311x support
  hwmon: (dme1737) group functions logically
  hwmon: (dme1737) cleanups
  hwmon: IBM power meter driver
  hwmon: (coretemp) Add support for Celeron 4xx
  hwmon: (lm87) Disable VID when it should be
  hwmon: (w83781d) Add individual alarm and beep files
  hwmon: VRM is not read from registers
  MAINTAINERS: update hwmon subsystem git trees
  hwmon: Fix the code examples in documentation
  hwmon: update sysfs interface document - error handling
  hwmon: (thmc50) Fix a debug message
  hwmon: (thmc50) Don't create temp3 if not enabled
  ...

diff --combined MAINTAINERS
index 0fdb8a50b92158f0997990f612d16c861b6085c3,9f509551a46ceb4d98f381614a0804ab20f3155e..012fa837845d1e8a21f9ec1c829a074be8b37493
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -284,14 -284,6 +284,14 @@@ M:       corentin.labbe@geomatys.f
  L:    lm-sensors@lm-sensors.org
  S:    Maintained
  
 +ADM8211 WIRELESS DRIVER
 +P:    Michael Wu
 +M:    flamingice@sourmilk.net
 +L:    linux-wireless@vger.kernel.org
 +W:    http://linuxwireless.org/
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
 +S:    Maintained
 +
  ADT746X FAN DRIVER
  P:    Colin Leroy
  M:    colin@colino.net
@@@ -677,13 -669,6 +677,13 @@@ P:       Haavard Skinnemoe
  M:    hskinnemoen@atmel.com
  S:    Supported
  
 +ATMEL USBA UDC DRIVER
 +P:    Haavard Skinnemoen
 +M:    hskinnemoen@atmel.com
 +L:    kernel@avr32linux.org
 +W:    http://avr32linux.org/twiki/bin/view/Main/AtmelUsbDeviceDriver
 +S:    Supported
 +
  ATMEL WIRELESS DRIVER
  P:    Simon Kelley
  M:    simon@thekelleys.org.uk
@@@ -733,8 -718,34 +733,8 @@@ M:        rpurdie@rpsys.ne
  S:    Maintained
  
  BLACKFIN ARCHITECTURE
 -P:    Aubrey Li
 -M:    aubrey.li@analog.com
 -P:    Bernd Schmidt
 -M:    bernd.schmidt@analog.com
  P:    Bryan Wu
  M:    bryan.wu@analog.com
 -P:    Grace Pan
 -M:    grace.pan@analog.com
 -P:    Marc Hoffman
 -M:    marc.hoffman@analog.com
 -P:    Michael Hennerich
 -M:    michael.hennerich@analog.com
 -P:    Mike Frysinger
 -M:    michael.frysinger@analog.com
 -P:    Jerry Zeng
 -M:    jerry.zeng@analog.com
 -P:    Jie Zhang
 -M:    jie.zhang@analog.com
 -P:    Robin Getz
 -M:    robin.getz@analog.com
 -P:    Roy Huang
 -M:    roy.huang@analog.com
 -P:    Sonic Zhang
 -M:    sonic.zhang@analog.com
 -P:    Vivi Li
 -M:    vivi.li@analog.com
 -P:    Yi Li
 -M:    yi.li@analog.com
  L:    uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
  W:    http://blackfin.uclinux.org
  S:    Supported
@@@ -776,22 -787,6 +776,22 @@@ L:       linux-hams@vger.kernel.or
  W:    http://www.baycom.org/~tom/ham/ham.html
  S:    Maintained
  
 +B43 WIRELESS DRIVER
 +P:    Michael Buesch
 +M:    mb@bu3sch.de
 +P:    Stefano Brivio
 +M:    st3@riseup.net
 +L:    linux-wireless@vger.kernel.org
 +W:    http://bcm43xx.berlios.de/
 +S:    Maintained
 +
 +B43LEGACY WIRELESS DRIVER
 +P:    Larry Finger
 +M:    Larry.Finger@lwfinger.net
 +L:    linux-wireless@vger.kernel.org
 +W:    http://bcm43xx.berlios.de/
 +S:    Maintained
 +
  BCM43XX WIRELESS DRIVER (SOFTMAC BASED VERSION)
  P:    Larry Finger
  M:    Larry.Finger@lwfinger.net
@@@ -1255,6 -1250,12 +1255,6 @@@ L:     Eng.Linux@digi.co
  W:    http://www.digi.com
  S:    Orphaned
  
 -DIGI RIGHTSWITCH NETWORK DRIVER
 -P:    Rick Richardson
 -L:    netdev@vger.kernel.org
 -W:    http://www.digi.com
 -S:    Orphaned
 -
  DIRECTORY NOTIFICATION
  P:    Stephen Rothwell
  M:    sfr@canb.auug.org.au
@@@ -1542,7 -1543,7 +1542,7 @@@ P:      Pantelis Antonio
  M:    pantelis.antoniou@gmail.com
  P:    Vitaly Bordug
  M:    vbordug@ru.mvista.com
 -L:    linuxppc-embedded@ozlabs.org
 +L:    linuxppc-dev@ozlabs.org
  L:    netdev@vger.kernel.org
  S:    Maintained
  
@@@ -1550,14 -1551,14 +1550,14 @@@ FREESCALE HIGHSPEED USB DEVICE DRIVE
  P:    Li Yang
  M:    leoli@freescale.com
  L:    linux-usb-devel@lists.sourceforge.net
 -L:    linuxppc-embedded@ozlabs.org
 +L:    linuxppc-dev@ozlabs.org
  S:    Maintained
  
  FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
  P:    Li Yang
  M:    leoli@freescale.com
  L:    netdev@vger.kernel.org
 -L:    linuxppc-embedded@ozlabs.org
 +L:    linuxppc-dev@ozlabs.org
  S:    Maintained
  
  FILE LOCKING (flock() and fcntl()/lockf())
@@@ -1660,7 -1661,8 +1660,8 @@@ P:      Mark M. Hoffma
  M:    mhoffman@lightlink.com
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
- T:    git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git
+ T:    git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git testing
+ T:    git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git release
  S:    Maintained
  
  HARDWARE RANDOM NUMBER GENERATOR CORE
@@@ -1776,8 -1778,8 +1777,8 @@@ M:      venkatesh.pallipadi@intel.co
  S:    Maintained
  
  HPET: x86_64
 -P:    Andi Kleen and Vojtech Pavlik
 -M:    andi@firstfloor.org and vojtech@suse.cz
 +P:    Vojtech Pavlik
 +M:    vojtech@suse.cz
  S:    Maintained
  
  HPET: ACPI hpet.c
@@@ -2021,14 -2023,16 +2022,14 @@@ W:   http://sourceforge.net/projects/e100
  S:    Supported
  
  INTEL PRO/10GbE SUPPORT
 -P:    Jeff Kirsher
 -M:    jeffrey.t.kirsher@intel.com
  P:    Ayyappan Veeraiyan
  M:    ayyappan.veeraiyan@intel.com
 -P:    John Ronciak
 -M:    john.ronciak@intel.com
 -P:    Jesse Brandeburg
 -M:    jesse.brandeburg@intel.com
  P:    Auke Kok
  M:    auke-jan.h.kok@intel.com
 +P:    Jesse Brandeburg
 +M:    jesse.brandeburg@intel.com
 +P:    John Ronciak
 +M:    john.ronciak@intel.com
  L:    e1000-devel@lists.sourceforge.net
  W:    http://sourceforge.net/projects/e1000/
  S:    Supported
@@@ -2055,15 -2059,6 +2056,15 @@@ L:    http://lists.sourceforge.net/mailman
  W:    http://ipw2200.sourceforge.net
  S:    Supported
  
 +INTEL WIRELESS WIFI LINK (iwlwifi)
 +P:    Zhu Yi
 +M:    yi.zhu@intel.com
 +L:    linux-wireless@vger.kernel.org
 +L:    ipw3945-devel@lists.sourceforge.net
 +W:    http://intellinuxwireless.org
 +T:    git git://intellinuxwireless.org/repos/iwlwifi
 +S:    Supported
 +
  IOC3 ETHERNET DRIVER
  P:    Ralf Baechle
  M:    ralf@linux-mips.org
@@@ -2081,16 -2076,6 +2082,16 @@@ P:    Juanjo Ciarlant
  M:    jjciarla@raiz.uncu.edu.ar
  S:    Maintained
  
 +IP1000A 10/100/1000 GIGABIT ETHERNET DRIVER
 +P:    Francois Romieu
 +M:    romieu@fr.zoreil.com
 +P:    Sorbica Shieh
 +M:    sorbica@icplus.com.tw
 +P:    Jesse Huang
 +M:    jesse@icplus.com.tw
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +
  IPATH DRIVER:
  P:    Arthur Jones
  M:    infinipath@qlogic.com
@@@ -2304,49 -2289,38 +2305,49 @@@ S:   Maintaine
  LINUX FOR POWERPC EMBEDDED MPC52XX
  P:    Sylvain Munaut
  M:    tnt@246tNt.com
 +P:    Grant Likely
 +M:    grant.likely@secretlab.ca
  W:    http://www.246tNt.com/mpc52xx/
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@ozlabs.org
 -L:    linuxppc-embedded@ozlabs.org
  S:    Maintained
  
  LINUX FOR POWERPC EMBEDDED PPC4XX
 +P:    Josh Boyer
 +M:    jwboyer@linux.vnet.ibm.com
  P:    Matt Porter
  M:    mporter@kernel.crashing.org
  W:    http://www.penguinppc.org/
 -L:    linuxppc-embedded@ozlabs.org
 +L:    linuxppc-dev@ozlabs.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc.git
 +S:    Maintained
 +
 +LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
 +P:    Grant Likely
 +M:    grant.likely@secretlab.ca
 +W:    http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
 +L:    linuxppc-dev@ozlabs.org
  S:    Maintained
  
  LINUX FOR POWERPC BOOT CODE
  P:    Tom Rini
  M:    trini@kernel.crashing.org
  W:    http://www.penguinppc.org/
 -L:    linuxppc-embedded@ozlabs.org
 +L:    linuxppc-dev@ozlabs.org
  S:    Maintained
  
  LINUX FOR POWERPC EMBEDDED PPC8XX
  P:    Marcelo Tosatti
  M:    marcelo@kvack.org
  W:    http://www.penguinppc.org/
 -L:    linuxppc-embedded@ozlabs.org
 +L:    linuxppc-dev@ozlabs.org
  S:    Maintained
  
  LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
  P:    Kumar Gala
  M:    galak@kernel.crashing.org
  W:    http://www.penguinppc.org/
 -L:    linuxppc-embedded@ozlabs.org
 +L:    linuxppc-dev@ozlabs.org
  S:    Maintained
  
  LINUX FOR POWERPC PA SEMI PWRFICIENT
@@@ -2588,18 -2562,12 +2589,18 @@@ L:   linux-kernel@vger.kernel.or
  W:    http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
  S:    Maintained
  
 -MULTIMEDIA CARD (MMC) AND SECURE DIGITAL (SD) SUBSYSTEM
 +MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
  P:    Pierre Ossman
  M:    drzeus-mmc@drzeus.cx
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
 +MULTIMEDIA CARD (MMC) ETC. OVER SPI
 +P:    David Brownell
 +M:    dbrownell@users.sourceforge.net
 +L:    linux-kernel@vger.kernel.org
 +S:    Odd fixes
 +
  MULTISOUND SOUND DRIVER
  P:    Andrew Veliath
  M:    andrewtv@usa.net
@@@ -3008,7 -2976,7 +3009,7 @@@ POWERPC 4xx EMAC DRIVE
  P:    Eugene Surovegin
  M:    ebs@ebshome.net
  W:    http://kernel.ebshome.net/emac/
 -L:    linuxppc-embedded@ozlabs.org
 +L:    linuxppc-dev@ozlabs.org
  L:    netdev@vger.kernel.org
  S:    Maintained
  
@@@ -3052,14 -3020,6 +3053,14 @@@ L:    kpreempt-tech@lists.sourceforge.ne
  W:    ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
  S:    Supported
  
 +P54 WIRELESS DRIVER
 +P:    Michael Wu
 +M:    flamingice@sourmilk.net
 +L:    linux-wireless@vger.kernel.org
 +W:    http://prism54.org
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
 +S:    Maintained
 +
  PRISM54 WIRELESS DRIVER
  P:    Luis R. Rodriguez
  M:    mcgrof@gmail.com
@@@ -3147,14 -3107,6 +3148,14 @@@ M:    corey@world.std.co
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
  
 +RALINK RT2X00 WLAN DRIVER
 +P:    rt2x00 project
 +L:    linux-wireless@vger.kernel.org
 +L:    rt2400-devel@lists.sourceforge.net
 +W:    http://rt2x00.serialmonkey.com/
 +S:    Maintained
 +F:    drivers/net/wireless/rt2x00/
 +
  RANDOM NUMBER DRIVER
  P:    Matt Mackall
  M:    mpm@selenic.com
@@@ -3240,8 -3192,8 +3241,8 @@@ W:      http://www.ibm.com/developerworks/li
  S:    Supported
  
  S390 NETWORK DRIVERS
 -P:    Frank Pavlic
 -M:    fpavlic@de.ibm.com
 +P:    Ursula Braun
 +M:    ubraun@linux.vnet.ibm.com
  M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -3255,14 -3207,6 +3256,14 @@@ L:    linux-s390@vger.kernel.or
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  
 +S390 IUCV NETWORK LAYER
 +P:    Ursula Braun
 +M:    ubraun@linux.vnet.ibm.com
 +M:    linux390@de.ibm.com
 +L:    linux-s390@vger.kernel.org
 +W:    http://www.ibm.com/developerworks/linux/linux390/
 +S:    Supported
 +
  SAA7146 VIDEO4LINUX-2 DRIVER
  P:    Michael Hunold
  M:    michael@mihu.de
@@@ -3487,12 -3431,6 +3488,12 @@@ M:    tsbogend@alpha.franken.d
  L:    netdev@vger.kernel.org
  S:    Maintained
  
 +SONICS SILICON BACKPLANE DRIVER (SSB)
 +P:    Michael Buesch
 +M:    mb@bu3sch.de
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +
  SONY VAIO CONTROL DEVICE DRIVER
  P:    Mattia Dongili
  M:    malattia@linux.it
@@@ -3677,14 -3615,6 +3678,14 @@@ M:    hlhung3i@gmail.co
  W:    http://tcp-lp-mod.sourceforge.net/
  S:    Maintained
  
 +TEHUTI ETHERNET DRIVER
 +P:    Alexander Indenbaum
 +M:    baum@tehutinetworks.net
 +P:    Andy Gospodarek
 +M:    andy@greyhouse.net
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +
  TI FLASH MEDIA INTERFACE DRIVER
  P:      Alex Dubov
  M:      oakad@yahoo.com
@@@ -4177,7 -4107,7 +4178,7 @@@ W83791D HARDWARE MONITORING DRIVE
  P:    Charles Spirakis
  M:    bezaur@gmail.com
  L:    lm-sensors@lm-sensors.org
- S:    Maintained
+ S:    Odd Fixes
  
  W83793 HARDWARE MONITORING DRIVER
  P:    Rudolf Marek
@@@ -4247,13 -4177,6 +4248,13 @@@ W:    http://oss.sgi.com/projects/xf
  T:    git git://oss.sgi.com:8090/xfs/xfs-2.6.git
  S:    Supported
  
 +XILINX SYSTEMACE DRIVER
 +P:    Grant Likely
 +M:    grant.likely@secretlab.ca
 +W:    http://www.secretlab.ca/
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +
  XILINX UARTLITE SERIAL DRIVER
  P:    Peter Korsgaard
  M:    jacmet@sunsite.dk
@@@ -4265,6 -4188,14 +4266,6 @@@ P:     Ingo Molna
  M:    mingo@redhat.com
  S:    Maintained
  
 -X86-64 port
 -P:    Andi Kleen
 -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
  P:    Jean-Paul Roubelat
  M:    jpr@f6fbb.org

diff --combined drivers/hwmon/abituguru.c
index 2317f4bb9c92163b93d0dae550904a34b071d3a0,719151a92fec4cd038af4b972f6b1973b8c7017b..4dbdb81ea3b1bfffce5d016746409ef7a3fe7f1d
--- 1/drivers/hwmon/abituguru.c
--- 2/drivers/hwmon/abituguru.c
+++ b/drivers/hwmon/abituguru.c
@@@ -176,7 -176,7 +176,7 @@@ MODULE_PARM_DESC(verbose, "How verbose 
     The structure is dynamically allocated, at the same time when a new
     abituguru device is allocated. */
  struct abituguru_data {
-       struct class_device *class_dev; /* hwmon registered device */
+       struct device *hwmon_dev;       /* hwmon registered device */
        struct mutex update_lock;       /* protect access to data and uGuru */
        unsigned long last_updated;     /* In jiffies */
        unsigned short addr;            /* uguru base address */
@@@ -1287,11 -1287,11 +1287,11 @@@ static int __devinit abituguru_probe(st
                                &abituguru_sysfs_attr[i].dev_attr))
                        goto abituguru_probe_error;
  
-       data->class_dev = hwmon_device_register(&pdev->dev);
-       if (!IS_ERR(data->class_dev))
+       data->hwmon_dev = hwmon_device_register(&pdev->dev);
+       if (!IS_ERR(data->hwmon_dev))
                return 0; /* success */
  
-       res = PTR_ERR(data->class_dev);
+       res = PTR_ERR(data->hwmon_dev);
  abituguru_probe_error:
        for (i = 0; data->sysfs_attr[i].dev_attr.attr.name; i++)
                device_remove_file(&pdev->dev, &data->sysfs_attr[i].dev_attr);
@@@ -1308,7 -1308,7 +1308,7 @@@ static int __devexit abituguru_remove(s
        int i;
        struct abituguru_data *data = platform_get_drvdata(pdev);
  
-       hwmon_device_unregister(data->class_dev);
+       hwmon_device_unregister(data->hwmon_dev);
        for (i = 0; data->sysfs_attr[i].dev_attr.attr.name; i++)
                device_remove_file(&pdev->dev, &data->sysfs_attr[i].dev_attr);
        for (i = 0; i < ARRAY_SIZE(abituguru_sysfs_attr); i++)
@@@ -1449,7 -1449,7 +1449,7 @@@ static int __init abituguru_init(void
        struct resource res = { .flags = IORESOURCE_IO };
  
  #ifdef CONFIG_DMI
 -      char *board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
 +      const char *board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
  
        /* safety check, refuse to load on non Abit motherboards */
        if (!force && (!board_vendor ||

diff --combined drivers/hwmon/applesmc.c
index 56213b7f8188ecbf39417ba75a431bc48cddeff3,21ff8e1268896cf3d8985712599ef7dca0815b00..f37fd7ebf65ad80b2173796b415d2b9cebacb51d
--- 1/drivers/hwmon/applesmc.c
--- 2/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@@ -127,7 -127,7 +127,7 @@@ static s16 rest_x
  static s16 rest_y;
  static struct timer_list applesmc_timer;
  static struct input_dev *applesmc_idev;
- static struct class_device *hwmon_class_dev;
+ static struct device *hwmon_dev;
  
  /* Indicates whether this computer has an accelerometer. */
  static unsigned int applesmc_accelerometer;
@@@ -1071,7 -1071,7 +1071,7 @@@ static const struct attribute_group tem
  /*
   * applesmc_dmi_match - found a match.  return one, short-circuiting the hunt.
   */
 -static int applesmc_dmi_match(struct dmi_system_id *id)
 +static int applesmc_dmi_match(const struct dmi_system_id *id)
  {
        int i = 0;
        struct dmi_match_data* dmi_data = id->driver_data;
@@@ -1287,9 -1287,9 +1287,9 @@@ static int __init applesmc_init(void
                        goto out_light_wq;
        }
  
-       hwmon_class_dev = hwmon_device_register(&pdev->dev);
-       if (IS_ERR(hwmon_class_dev)) {
-               ret = PTR_ERR(hwmon_class_dev);
+       hwmon_dev = hwmon_device_register(&pdev->dev);
+       if (IS_ERR(hwmon_dev)) {
+               ret = PTR_ERR(hwmon_dev);
                goto out_light_ledclass;
        }
  
@@@ -1331,7 -1331,7 +1331,7 @@@ out
  
  static void __exit applesmc_exit(void)
  {
-       hwmon_device_unregister(hwmon_class_dev);
+       hwmon_device_unregister(hwmon_dev);
        if (applesmc_light) {
                led_classdev_unregister(&applesmc_backlight);
                destroy_workqueue(applesmc_led_wq);

diff --combined drivers/misc/thinkpad_acpi.c
index 6c0b2f0a51ab5c606c22ca5aec1a9e41a7468d3a,a717a25fb86a35505172dc559c33c6170a444fe9..216948dd71a55dd1b7f7f72b5c3f2cfa5588f8ab
--- 1/drivers/misc/thinkpad_acpi.c
--- 2/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@@ -517,7 -517,7 +517,7 @@@ static char *next_cmd(char **cmds
   ****************************************************************************/
  
  static struct platform_device *tpacpi_pdev;
- static struct class_device *tpacpi_hwmon;
+ static struct device *tpacpi_hwmon;
  static struct input_dev *tpacpi_inputdev;
  
  
@@@ -4448,7 -4448,7 +4448,7 @@@ static void ibm_exit(struct ibm_struct 
  
  static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp)
  {
 -      struct dmi_device *dev = NULL;
 +      const struct dmi_device *dev = NULL;
        char ec_fw_string[18];
  
        if (!tp)