Merge tag 'char-misc-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull Char/Misc driver merge from Greg Kroah-Hartman:
 "Here is the "big" char/misc driver patches for 3.8-rc1.  I'm starting
  to put random driver subsystems that I had previously sent you through
  the driver-core tree in this tree, as it makes more sense to do so.

  Nothing major here, the various __dev* removals, some mei driver
  updates, and other random driver-specific things from the different
  maintainers and developers.

  Note, some MFD drivers got added through this tree, and they are also
  coming in through the "real" MFD tree as well, due to some major
  mis-communication between me and the different developers.  If you
  have any merge conflicts, take the ones from the MFD tree, not these
  ones, sorry about that.

  All of this has been in linux-next for a while.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fix up trivial conflict in drivers/mmc/host/Kconfig due to new drivers
having been added (both at the end, as usual..)

* tag 'char-misc-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (84 commits)
  MAINTAINERS: remove drivers/staging/hv/
  misc/st_kim: Free resources in the error path of probe()
  drivers/char: for hpet, add count checking, and ~0UL instead of -1
  w1-gpio: Simplify & get rid of defines
  w1-gpio: Pinctrl-fy
  extcon: remove use of __devexit_p
  extcon: remove use of __devinit
  extcon: remove use of __devexit
  drivers: uio: Only allocate new private data when probing device tree node
  drivers: uio_dmem_genirq: Allow partial success when opening device
  drivers: uio_dmem_genirq: Don't use DMA_ERROR_CODE to indicate unmapped regions
  drivers: uio_dmem_genirq: Don't mix address spaces for dynamic region vaddr
  uio: remove use of __devexit
  uio: remove use of __devinitdata
  uio: remove use of __devinit
  uio: remove use of __devexit_p
  char: remove use of __devexit
  char: remove use of __devinitconst
  char: remove use of __devinitdata
  char: remove use of __devinit
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/char/tpm/tpm_i2c_infineon.c
Simple merge

diff --cc drivers/char/tpm/tpm_ibmvtpm.c
Simple merge

diff --cc drivers/char/tpm/tpm_infineon.c
Simple merge

diff --cc drivers/char/tpm/tpm_tis.c
Simple merge

diff --cc drivers/mmc/host/Kconfig
index bebbe167fd89e458bc08c8e517b343b23f629a2d,dfa6d56ff0ff3db0e7137e0ca19f538923375846..737e4edc241bcf3d17db3f2cb21866b76504f072
--- 1/drivers/mmc/host/Kconfig
--- 2/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@@ -614,13 -622,9 +614,20 @@@ config MMC_USH
          Note: These controllers only support SDIO cards and do not
          support MMC or SD memory cards.
  
 +config MMC_WMT
 +      tristate "Wondermedia SD/MMC Host Controller support"
 +      depends on ARCH_VT8500
 +      default y
 +      help
 +        This selects support for the SD/MMC Host Controller on
 +        Wondermedia WM8505/WM8650 based SoCs.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called wmt-sdmmc.
++
+ config MMC_REALTEK_PCI
+       tristate "Realtek PCI-E SD/MMC Card Interface Driver"
+       depends on MFD_RTSX_PCI
+       help
+         Say Y here to include driver code to support SD/MMC card interface
+         of Realtek PCI-E card reader

diff --cc drivers/mmc/host/Makefile
index c5eddc1b4833f286cab2f2e804805205d57654bb,8aa592d14c4eac95e18ef61729ca949ad4a02799..b648058d718234e7b69dbceabd57df6bf90489fd
--- 1/drivers/mmc/host/Makefile
--- 2/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@@ -45,8 -45,9 +45,10 @@@ obj-$(CONFIG_MMC_SH_MMCIF)   += sh_mmcif.
  obj-$(CONFIG_MMC_JZ4740)      += jz4740_mmc.o
  obj-$(CONFIG_MMC_VUB300)      += vub300.o
  obj-$(CONFIG_MMC_USHC)                += ushc.o
 +obj-$(CONFIG_MMC_WMT)         += wmt-sdmmc.o
  
+ obj-$(CONFIG_MMC_REALTEK_PCI) += rtsx_pci_sdmmc.o
+ 
  obj-$(CONFIG_MMC_SDHCI_PLTFM)         += sdhci-pltfm.o
  obj-$(CONFIG_MMC_SDHCI_CNS3XXX)               += sdhci-cns3xxx.o
  obj-$(CONFIG_MMC_SDHCI_ESDHC_IMX)     += sdhci-esdhc-imx.o