diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 14:38:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 14:38:37 -0400 |
| commit | 48f286a28fe13fcbc510720fcffb872a184b51dd (patch) | |
| tree | f50d868589138628c04dd5600a029ef80fa21da2 /MAINTAINERS | |
| parent | ea431793f198e26d1553f36ed8b5a830b531eee4 (diff) | |
| parent | fa15ce8ad59e9653d50b8596596cb02d3566d4aa (diff) | |
Merge branch 'for-next' of git://git.o-hand.com/linux-mfd
* 'for-next' of git://git.o-hand.com/linux-mfd:
mfd: fix da903x warning
mfd: fix MAINTAINERS entry
mfd: Use the value of the final spin when reading the AUXADC
mfd: Storage class should be before const qualifier
mfd: PASIC3: supply clock_rate to DS1WM via driver_data
mfd: remove DS1WM clock handling
mfd: remove unused PASIC3 bus_shift field
pxa/magician: remove deprecated .bus_shift from PASIC3 platform_data
mfd: convert PASIC3 to use MFD core
mfd: convert DS1WM to use MFD core
mfd: Support active high IRQs on WM835x
mfd: Use bulk read to fill WM8350 register cache
mfd: remove duplicated #include from pcf50633
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 60c970685833..9673cd28a69b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3051,8 +3051,9 @@ S: Maintained | |||
| 3051 | 3051 | ||
| 3052 | MULTIFUNCTION DEVICES (MFD) | 3052 | MULTIFUNCTION DEVICES (MFD) |
| 3053 | P: Samuel Ortiz | 3053 | P: Samuel Ortiz |
| 3054 | M: sameo@openedhand.com | 3054 | M: sameo@linux.intel.com |
| 3055 | L: linux-kernel@vger.kernel.org | 3055 | L: linux-kernel@vger.kernel.org |
| 3056 | T: git kernel.org:/pub/scm/linux/kernel/git/sameo/mfd-2.6.git | ||
| 3056 | S: Supported | 3057 | S: Supported |
| 3057 | 3058 | ||
| 3058 | MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM | 3059 | MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM |