diff options
| author | Linus Torvalds | 2012-07-13 09:54:26 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2012-07-13 09:54:26 -0700 |
| commit | 7801dc33bec3ad33f0de2c4138eeb6f785ada8dc (patch) | |
| tree | 242892df3f0171f043cacb83cdc62911bce77c32 /drivers/parport/parport_mfc3.c | |
| parent | 68394bfbe507f266bb13d8152976218a97f51b45 (diff) | |
| parent | b330f85d3d42cbe091736a0abd8f005b448d133a (diff) | |
Merge tag 'mfd-for-linus-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
Pull MFD Fixes from Samuel Ortiz:
- Three Palmas fixes, One of them being a build error fix.
- Two mc13xx fixes. One for fixing an SPI regmap configuration and
another one for working around an i.Mx hardware bug.
- One omap-usb regression fix.
- One twl6040 build breakage fix.
- One file deletion (ab5500-core.h) that was overlooked during the last
merge window.
* tag 'mfd-for-linus-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: Add missing hunk to change palmas irq to clear on read
mfd: Fix palmas regulator pdata missing
mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix issues.
mfd: Update twl6040 Kconfig to avoid build breakage
mfd: Delete ab5500-core.h
mfd: mc13xxx workaround SPI hardware bug on i.Mx
mfd: Fix mc13xxx SPI regmap
mfd: Add terminating entry for i2c_device_id palmas table
Diffstat (limited to 'drivers/parport/parport_mfc3.c')
0 files changed, 0 insertions, 0 deletions