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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regulator: Convert tps65023 to use regmap API
  regmap: Add SPI bus support
  regmap: Add I2C bus support
  regmap: Add generic non-memory mapped register access API

diff --combined MAINTAINERS
index 612316c352a298176a3648b9a03f6e72c24223d4,b7eaf6393d36868c7531615555f5184ff2ae6d34..63524a09ca863a8b1107823ac6efb1d85ce73f51
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1,5 -1,4 +1,5 @@@
  
 +
        List of maintainers and how to submit kernel changes
  
  Please try to follow the guidelines below.  This will make things
@@@ -534,8 -533,6 +534,8 @@@ L: [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://wiki.analog.com/
  S:    Supported
 +F:    sound/soc/codecs/adau*
 +F:    sound/soc/codecs/adav*
  F:    sound/soc/codecs/ad1*
  F:    sound/soc/codecs/ssm*
  
@@@ -1553,12 -1550,6 +1553,12 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/staging/brcm80211/
  
 +BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 +M:    Bhanu Prakash Gollapudi <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/bnx2fc/
 +
  BROCADE BFA FC SCSI DRIVER
  M:    Jing Huang <[email protected]>
  L:    [email protected]
@@@ -1781,8 -1772,7 +1781,8 @@@ F:      include/linux/clk.
  
  CISCO FCOE HBA DRIVER
  M:    Abhijeet Joglekar <[email protected]>
 -M:    Joe Eykholt <[email protected]>
 +M:    Venkata Siva Vijayendra Bhamidipati <[email protected]>
 +M:    Brian Uchino <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/scsi/fnic/
@@@ -3435,9 -3425,10 +3435,9 @@@ S:     Maintaine
  F:    drivers/net/ipg.*
  
  IPATH DRIVER
 -M:    Ralph Campbell <[email protected]>
 +M:    Mike Marciniszyn <[email protected]>
  L:    [email protected]
 -T:    git git://git.qlogic.com/ipath-linux-2.6
 -S:    Supported
 +S:    Maintained
  F:    drivers/infiniband/hw/ipath/
  
  IPMI SUBSYSTEM
@@@ -4298,8 -4289,8 +4298,8 @@@ S:      Maintaine
  F:    drivers/usb/musb/
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 +M:    Jon Mason <[email protected]>
  M:    Andrew Gallatin <[email protected]>
 -M:    Brice Goglin <[email protected]>
  L:    [email protected]
  W:    http://www.myri.com/scs/download-Myri10GE.html
  S:    Supported
@@@ -4593,8 -4584,9 +4593,8 @@@ S:      Maintaine
  F:    drivers/mmc/host/omap.c
  
  OMAP HS MMC SUPPORT
 -M:    Madhusudhan Chikkature <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/mmc/host/omap_hsmmc.c
  
  OMAP RANDOM NUMBER GENERATOR SUPPORT
@@@ -5160,12 -5152,6 +5160,12 @@@ M:    Robert Jarzmik <robert.jarzmik@free.
  L:    [email protected]
  S:    Maintained
  
 +QIB DRIVER
 +M:    Mike Marciniszyn <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/infiniband/hw/qib/
 +
  QLOGIC QLA1280 SCSI DRIVER
  M:    Michael Reed <[email protected]>
  L:    [email protected]
@@@ -5327,6 -5313,13 +5327,13 @@@ L:    [email protected]
  S:    Supported
  F:    fs/reiserfs/
  
+ REGISTER MAP ABSTRACTION
+ M:    Mark Brown <[email protected]>
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
+ S:    Supported
+ F:    drivers/base/regmap/
+ F:    include/linux/regmap.h
+ 
  RFKILL
  M:    Johannes Berg <[email protected]>
  L:    [email protected]
@@@ -6256,14 -6249,9 +6263,14 @@@ F:    drivers/char/toshiba.
  F:    include/linux/toshiba.h
  
  TMIO MMC DRIVER
 +M:    Guennadi Liakhovetski <[email protected]>
  M:    Ian Molton <[email protected]>
 +L:    [email protected]
  S:    Maintained
 -F:    drivers/mmc/host/tmio_mmc.*
 +F:    drivers/mmc/host/tmio_mmc*
 +F:    drivers/mmc/host/sh_mobile_sdhi.c
 +F:    include/linux/mmc/tmio.h
 +F:    include/linux/mmc/sh_mobile_sdhi.h
  
  TMPFS (SHMEM FILESYSTEM)
  M:    Hugh Dickins <[email protected]>
@@@ -6340,7 -6328,7 +6347,7 @@@ F:      drivers/scsi/u14-34f.
  
  UBI FILE SYSTEM (UBIFS)
  M:    Artem Bityutskiy <[email protected]>
 -M:    Adrian Hunter <adrian.hunter@nokia.com>
 +M:    Adrian Hunter <adrian.hunter@intel.com>
  L:    [email protected]
  T:    git git://git.infradead.org/ubifs-2.6.git
  W:    http://www.linux-mtd.infradead.org/doc/ubifs.html

diff --combined drivers/base/Makefile
index 5ab0d07c4578dcc5dd63bfb384adf68cd1151474,dd4f9b245fc15acb2165ac21deb520160949ef10..99a375ad2cc9694181da8b93862fa76f170ad9fe
--- 1/drivers/base/Makefile
--- 2/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@@ -13,10 -13,12 +13,11 @@@ obj-$(CONFIG_FW_LOADER)    += firmware_cla
  obj-$(CONFIG_NUMA)    += node.o
  obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
  obj-$(CONFIG_SMP)     += topology.o
 -obj-$(CONFIG_IOMMU_API) += iommu.o
  ifeq ($(CONFIG_SYSFS),y)
  obj-$(CONFIG_MODULES) += module.o
  endif
  obj-$(CONFIG_SYS_HYPERVISOR) += hypervisor.o
+ obj-$(CONFIG_REGMAP)  += regmap/
  
  ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG