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

* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  i2c: Constify i2c_client where possible
  i2c-algo-bit: Complain about masters which can't read SCL
  i2c-algo-bit: Refactor adapter registration
  i2c: Add generic I2C multiplexer using GPIO API
  i2c-nforce2: Remove unnecessary cast of pci_get_drvdata
  i2c-i801: Include <linux/slab.h>

diff --combined MAINTAINERS
index ad600c54c7bffbb79633ea9417f6c64382ce831b,23a4765ab8d28d310c85a5895a660882600b8e93..bb6c1ac85138878ddfe3a3cecbbf1874af0b8638
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -285,41 -285,6 +285,41 @@@ L:       linux-parisc@vger.kernel.or
  S:    Maintained
  F:    sound/pci/ad1889.*
  
 +AD525X ANALOG DEVICES DIGITAL POTENTIOMETERS DRIVER
 +M:    Michael Hennerich <michael.hennerich@analog.com>
 +L:    device-driver-devel@blackfin.uclinux.org
 +W:    http://wiki-analog.com/AD5254
 +S:    Supported
 +F:    drivers/misc/ad525x_dpot.c
 +
 +AD5398 CURRENT REGULATOR DRIVER (AD5398/AD5821)
 +M:    Michael Hennerich <michael.hennerich@analog.com>
 +L:    device-driver-devel@blackfin.uclinux.org
 +W:    http://wiki-analog.com/AD5398
 +S:    Supported
 +F:    drivers/regulator/ad5398.c
 +
 +AD714X CAPACITANCE TOUCH SENSOR DRIVER (AD7142/3/7/8/7A)
 +M:    Michael Hennerich <michael.hennerich@analog.com>
 +L:    device-driver-devel@blackfin.uclinux.org
 +W:    http://wiki-analog.com/AD7142
 +S:    Supported
 +F:    drivers/input/misc/ad714x.c
 +
 +AD7877 TOUCHSCREEN DRIVER
 +M:    Michael Hennerich <michael.hennerich@analog.com>
 +L:    device-driver-devel@blackfin.uclinux.org
 +W:    http://wiki-analog.com/AD7877
 +S:    Supported
 +F:    drivers/input/touchscreen/ad7877.c
 +
 +AD7879 TOUCHSCREEN DRIVER (AD7879/AD7889)
 +M:    Michael Hennerich <michael.hennerich@analog.com>
 +L:    device-driver-devel@blackfin.uclinux.org
 +W:    http://wiki-analog.com/AD7879
 +S:    Supported
 +F:    drivers/input/touchscreen/ad7879.c
 +
  ADM1025 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <khali@linux-fr.org>
  L:    lm-sensors@lm-sensors.org
@@@ -339,32 -304,6 +339,32 @@@ W:       http://linuxwireless.org
  S:    Orphan
  F:    drivers/net/wireless/adm8211.*
  
 +ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
 +M:    Michael Hennerich <michael.hennerich@analog.com>
 +L:    device-driver-devel@blackfin.uclinux.org
 +W:    http://wiki-analog.com/ADP5520
 +S:    Supported
 +F:    drivers/mfd/adp5520.c
 +F:    drivers/video/backlight/adp5520_bl.c
 +F:    drivers/led/leds-adp5520.c
 +F:    drivers/gpio/adp5520-gpio.c
 +F:    drivers/input/keyboard/adp5520-keys.c
 +
 +ADP5588 QWERTY KEYPAD AND IO EXPANDER DRIVER (ADP5588/ADP5587)
 +M:    Michael Hennerich <michael.hennerich@analog.com>
 +L:    device-driver-devel@blackfin.uclinux.org
 +W:    http://wiki-analog.com/ADP5588
 +S:    Supported
 +F:    drivers/input/keyboard/adp5588-keys.c
 +F:    drivers/gpio/adp5588-gpio.c
 +
 +ADP8860 BACKLIGHT DRIVER (ADP8860/ADP8861/ADP8863)
 +M:    Michael Hennerich <michael.hennerich@analog.com>
 +L:    device-driver-devel@blackfin.uclinux.org
 +W:    http://wiki-analog.com/ADP8860
 +S:    Supported
 +F:    drivers/video/backlight/adp8860_bl.c
 +
  ADT746X FAN DRIVER
  M:    Colin Leroy <colin@colino.net>
  S:    Maintained
@@@ -377,13 -316,6 +377,13 @@@ S:       Maintaine
  F:    Documentation/hwmon/adt7475
  F:    drivers/hwmon/adt7475.c
  
 +ADXL34X THREE-AXIS DIGITAL ACCELEROMETER DRIVER (ADXL345/ADXL346)
 +M:    Michael Hennerich <michael.hennerich@analog.com>
 +L:    device-driver-devel@blackfin.uclinux.org
 +W:    http://wiki-analog.com/ADXL345
 +S:    Supported
 +F:    drivers/input/misc/adxl34x.c
 +
  ADVANSYS SCSI DRIVER
  M:    Matthew Wilcox <matthew@wil.cx>
  L:    linux-scsi@vger.kernel.org
@@@ -508,23 -440,17 +508,23 @@@ L:      linux-rdma@vger.kernel.or
  S:    Maintained
  F:    drivers/infiniband/hw/amso1100/
  
 -ANALOG DEVICES INC ASOC DRIVERS
 -L:    uclinux-dist-devel@blackfin.uclinux.org
 +ANALOG DEVICES INC ASOC CODEC DRIVERS
 +L:    device-driver-devel@blackfin.uclinux.org
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 -W:    http://blackfin.uclinux.org/
 +W:    http://wiki-analog.com/
  S:    Supported
 -F:    sound/soc/blackfin/*
  F:    sound/soc/codecs/ad1*
  F:    sound/soc/codecs/adau*
  F:    sound/soc/codecs/adav*
  F:    sound/soc/codecs/ssm*
  
 +ANALOG DEVICES INC ASOC DRIVERS
 +L:    uclinux-dist-devel@blackfin.uclinux.org
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +W:    http://blackfin.uclinux.org/
 +S:    Supported
 +F:    sound/soc/blackfin/*
 +
  AOA (Apple Onboard Audio) ALSA DRIVER
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -1497,9 -1423,7 +1497,9 @@@ F:      drivers/net/tg3.
  BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
  M:    Brett Rudley <brudley@broadcom.com>
  M:    Henry Ptasinski <henryp@broadcom.com>
 -M:    Nohee Ko <noheek@broadcom.com>
 +M:    Dowan Kim <dowan@broadcom.com>
 +M:    Roland Vossen <rvossen@broadcom.com>
 +M:    Arend van Spriel <arend@broadcom.com>
  L:    linux-wireless@vger.kernel.org
  S:    Supported
  F:    drivers/staging/brcm80211/
@@@ -2347,14 -2271,6 +2347,14 @@@ W:    http://acpi4asus.sf.ne
  S:    Maintained
  F:    drivers/platform/x86/eeepc-laptop.c
  
 +EEEPC WMI EXTRAS DRIVER
 +M:    Corentin Chary <corentincj@iksaif.net>
 +L:    acpi4asus-user@lists.sourceforge.net
 +L:    platform-driver-x86@vger.kernel.org
 +W:    http://acpi4asus.sf.net
 +S:    Maintained
 +F:    drivers/platform/x86/eeepc-wmi.c
 +
  EFIFB FRAMEBUFFER DRIVER
  L:    linux-fbdev@vger.kernel.org
  M:    Peter Jones <pjones@redhat.com>
@@@ -2692,6 -2608,14 +2692,14 @@@ S:    Supporte
  F:    drivers/i2c/busses/i2c-gpio.c
  F:    include/linux/i2c-gpio.h
  
+ GENERIC GPIO I2C MULTIPLEXER DRIVER
+ M:    Peter Korsgaard <peter.korsgaard@barco.com>
+ L:    linux-i2c@vger.kernel.org
+ S:    Supported
+ F:    drivers/i2c/muxes/gpio-i2cmux.c
+ F:    include/linux/gpio-i2cmux.h
+ F:    Documentation/i2c/muxes/gpio-i2cmux
+ 
  GENERIC HDLC (WAN) DRIVERS
  M:    Krzysztof Halasa <khc@pm.waw.pl>
  W:    http://www.kernel.org/pub/linux/utils/net/hdlc/
@@@ -4352,7 -4276,6 +4360,7 @@@ NILFS2 FILESYSTE
  M:    KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
  L:    linux-nilfs@vger.kernel.org
  W:    http://www.nilfs.org/en/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git
  S:    Supported
  F:    Documentation/filesystems/nilfs2.txt
  F:    fs/nilfs2/
@@@ -6014,8 -5937,7 +6022,8 @@@ F:      drivers/net/tlan.
  TOMOYO SECURITY MODULE
  M:    Kentaro Takeda <takedakn@nttdata.co.jp>
  M:    Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
 -L:    tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for developers and users in English)
 +L:    tomoyo-dev-en@lists.sourceforge.jp (subscribers-only, for developers in English)
 +L:    tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for users in English)
  L:    tomoyo-dev@lists.sourceforge.jp (subscribers-only, for developers in Japanese)
  L:    tomoyo-users@lists.sourceforge.jp (subscribers-only, for users in Japanese)
  W:    http://tomoyo.sourceforge.jp/