tree a615ee2e8d08e0565c87dbef6bdb059c0bcd2ba2
parent 049ffa8ab33a63b3bff672d1a0ee6a35ad253fe8
parent 90b128ed1557c2f523995a379a53e5105891ecf8
author Samuel Ortiz <sameo@linux.intel.com> 1384529196 +0100
committer Samuel Ortiz <sameo@linux.intel.com> 1384529196 +0100
mergetag object 90b128ed1557c2f523995a379a53e5105891ecf8
 type commit
 tag mfd-3.13-1
 tagger Samuel Ortiz <sameo@linux.intel.com> 1384511202 +0100
 
 For the 3.13 merge window we have a couple of new drivers for the AMS
 AS3722 PMIC and for STMicroelectronics STw481x PMIC.
 
 Although this is a smaller update than usual, we also have:
 
 - Device tree support for the max77693 driver.
 
 - linux/of.h inclusion for all DT compatible MFD drivers, to avoid build
   breakage in the future.
 
 - Support for Intel Wildcat Point-LP PCH through the lpc_ich driver.
 
 - A small arizona update for new wm5110 DSP registers and a few fixes.
 
 - A small palmas update as well, including an of_device table addition
   and a few minor fixes.
 
 - Two small mfd-core changes, one including a memory leak fix for when
   mfd_add_device() fails.
 
 - Our usual round of minor cleanups and janitorial fixes.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJShjufAAoJEIqAPN1PVmxKRoEP/jKe0UgrNA6G4xHSPX1Xcktc
 /kaQdcwJcTTHMpkIyQPFayItCcBPyb8bN1SdrQs4sds4ut7xyjve2uHz0KpZI6JO
 F+Rh6UVNkUIbcEx3jfh0DDv3pHv0vryFPnerkOIr0TFmSF1Tj29dRORQzpEqZ2fZ
 rstxmxNTG0ggP0Ug4ivv/YWjhGmO9CvKePJzQyImrC8QWCRDiARu072bG8xhVyHZ
 PkJTzJr2kjkI3whIY7Z04Nx90AtpikM4G27JiCwsHyv4vCCOtTtC9lRYb/IBUHWJ
 UhJiPvTygsU63opGOyAodR9LJxta0UCWm2Qn71ZuBAJmQ4oFxdZ7iVkWePjeSF5U
 2Jx9dUi1UWJQNCSB8HEpaUExybXdsNTwnSw8NIb6Gg2kygClj5KvzPMwz3ZHRKU/
 Ef1TGpWTeuok0zOijhBDUqAhq4KQv/H9Xjbm8FIMSBVGQgRBT3dkYTRZv30deeg/
 SIzoJGg7QiMDwlu/33k7aX7aIwJA2r6st/Q3OUKp/aBVqd6i24rL5+ZMykqcx5HJ
 x9GnvjrHgz+nAgF2yU6KQT1FrX1IQEM4F1tgMtroXQcCAGgoWoJRjW82gQqp6NE+
 eVbvsE56z2MiSNbiYUL4hdC03b/z8LbzP1zEt95Xc+sOf7NewMHYln7XkByBxrPH
 tlR20ZV44W25s7DYg7xh
 =nQ/p
 -----END PGP SIGNATURE-----

Merge tag 'mfd-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next into mfd-3.13-merge

For the 3.13 merge window we have a couple of new drivers for the AMS
AS3722 PMIC and for STMicroelectronics STw481x PMIC.

Although this is a smaller update than usual, we also have:

- Device tree support for the max77693 driver.

- linux/of.h inclusion for all DT compatible MFD drivers, to avoid build
  breakage in the future.

- Support for Intel Wildcat Point-LP PCH through the lpc_ich driver.

- A small arizona update for new wm5110 DSP registers and a few fixes.

- A small palmas update as well, including an of_device table addition
  and a few minor fixes.

- Two small mfd-core changes, one including a memory leak fix for when
  mfd_add_device() fails.

- Our usual round of minor cleanups and janitorial fixes.

Conflicts:
	sound/soc/codecs/mc13783.c