diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-16 13:22:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-16 13:22:21 -0700 |
commit | 73f8be297e90f6ebb951c30490376833f8782349 (patch) | |
tree | 1e15c36ed544e33b82e2bbbc6ba8d787c9d3e7e4 /include/acpi/video.h | |
parent | c500ce38e52bb2f526b84f41314a9a9f83a2fdf5 (diff) | |
parent | b186b12487efc80c44f2f0d26cc26eb249cf1524 (diff) | |
download | linux-73f8be297e90f6ebb951c30490376833f8782349.tar.gz linux-73f8be297e90f6ebb951c30490376833f8782349.tar.bz2 linux-73f8be297e90f6ebb951c30490376833f8782349.zip |
Merge tag 'mfd-for-linus-3.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
Pull mfd fixes from Samuel Ortiz:
"This is the remaining MFD fixes for 3.6, with 5 pending fixes:
- A tps65217 build error fix.
- A lcp_ich regression fix caused by the MFD driver failing to
initialize the watchdog sub device due to ACPI conflicts.
- 2 MAX77693 interrupt handling bug fixes.
- An MFD core fix, adding an IRQ domain argument to the MFD device
addition API in order to prevent silent and potentially harmful
remapping behaviour changes for drivers supporting non-DT
platforms."
* tag 'mfd-for-linus-3.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: MAX77693: Fix NULL pointer error when initializing irqs
mfd: MAX77693: Fix interrupt handling bug
mfd: core: Push irqdomain mapping out into devices
mfd: lpc_ich: Fix a 3.5 kernel regression for iTCO_wdt driver
mfd: Move tps65217 regulator plat data handling to regulator
Diffstat (limited to 'include/acpi/video.h')
0 files changed, 0 insertions, 0 deletions