diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-21 12:42:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-21 12:42:12 -0700 |
| commit | 9f24ff6f4236f117729bdb2fe8b0c202ce86098f (patch) | |
| tree | 103ac64430efbb0340940fa95d5ad336b29b01de /sound/soc/soc-cache.c | |
| parent | bfce281c287a427d0841fadf5d59242757b4e620 (diff) | |
| parent | 82ea267f7dc853a5e6a724916a70a10656efdfc2 (diff) | |
Merge tag 'mfd-for-linus-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
Pull MFD fixes from Samuel Ortiz:
"We have 3 build fixes, a OMAP USB host PHY reset fix and the twl6040
conversion to an i2c driver. The latter may not sound like a fix but
the twl6040 MFD driver won't probe without it, triggering an OMAP4
audio regression."
* tag 'mfd-for-linus-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Fix modular builds of rc5t583 regulator support
mfd: Fix asic3_gpio_to_irq
ARM: OMAP3: USB: Fix the EHCI ULPI PHY reset issue
mfd: Convert twl6040 to i2c driver, and separate it from twl core
mfd : Fix dbx500 compilation error
Diffstat (limited to 'sound/soc/soc-cache.c')
0 files changed, 0 insertions, 0 deletions