diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 20:38:37 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-05 20:38:37 +0200 |
commit | 48f286a28fe13fcbc510720fcffb872a184b51dd (patch) | |
tree | f50d868589138628c04dd5600a029ef80fa21da2 /MAINTAINERS | |
parent | Merge branch 'for-linus' of git://repo.or.cz/cris-mirror (diff) | |
parent | mfd: fix da903x warning (diff) | |
download | linux-48f286a28fe13fcbc510720fcffb872a184b51dd.tar.xz linux-48f286a28fe13fcbc510720fcffb872a184b51dd.zip |
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 MULTIFUNCTION DEVICES (MFD) P: Samuel Ortiz -M: sameo@openedhand.com +M: sameo@linux.intel.com L: linux-kernel@vger.kernel.org +T: git kernel.org:/pub/scm/linux/kernel/git/sameo/mfd-2.6.git S: Supported MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM |