tag 519c3a1504535fb1a0cc69f160259b1eac6d0d57
tagger Samuel Ortiz <sameo@linux.intel.com> Mon Dec 17 02:11:18 2012 +0100
object 51282fc710e399fb8fdd1c22c0cfaec500163e40

This is the MFD patch set for the 3.8 merge window.

We have several new drivers, most of the time coming with their sub devices
drivers:

- ST Micro's sta2x11
- Austria Microsystem's AS3711
- Nano River's viperboard
- TI's TPS80031, AM335x TS/ADC,
- Realtek's MMC/memstick card reader
- Nokia's retu

We also got some notable cleanups and improvements:

- tps6586x got converted to IRQ domains.
- tps65910 and tps65090 moved to the regmap IRQ API.
- STMPE is now Device Tree aware.
- A general twl6040 and twl-core cleanup, with moves to the regmap I/O and IRQ
  APIs and a conversion to the recently added PWM framework.

Then the rest is mostly tiny cleanups and fixes, among which we have Mark's
wm5xxx and wm8xxx patchset.

commit 51282fc710e399fb8fdd1c22c0cfaec500163e40
author Samuel Ortiz <sameo@linux.intel.com> Mon Dec 17 01:58:08 2012 +0100
committer Samuel Ortiz <sameo@linux.intel.com> Mon Dec 17 01:58:08 2012 +0100
tree c75936f517e13ef8363aeb3105443154808ebd8d
parent 1881b68b8961a86d40c3c5c205e533515a2dc9c6
parent 2a74dbb9a86e8102dcd07d284135b4530a84826e

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-next-merge

Conflicts:
	drivers/gpio/gpio-tps6586x.c
	drivers/iio/adc/Kconfig
	drivers/iio/adc/Makefile
	drivers/mfd/Makefile
	drivers/mfd/ab8500-core.c
	drivers/mfd/da9052-core.c
	drivers/mfd/rtsx_pcr.c
	drivers/mfd/sta2x11-mfd.c
	drivers/mfd/tps65090.c
	drivers/mfd/twl-core.c
	drivers/mmc/host/Kconfig
	drivers/mmc/host/rtsx_pci_sdmmc.c
	drivers/power/da9052-battery.c
	include/linux/mfd/tps65090.h