diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 18:10:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 18:10:03 -0700 |
| commit | 5c4c1489b93c9dc51cc6e97fd73e325ce94983c0 (patch) | |
| tree | 16dc1628d614b882bb36fa57bdc88b1d30a83711 /MAINTAINERS | |
| parent | c2e68052429fdf87702fccd272951282bef1c60a (diff) | |
| parent | 964f9ce2ff42dc47cf40fbd2f5c81cd60689e384 (diff) | |
| download | linux-stable-5c4c1489b93c9dc51cc6e97fd73e325ce94983c0.tar.gz linux-stable-5c4c1489b93c9dc51cc6e97fd73e325ce94983c0.tar.bz2 linux-stable-5c4c1489b93c9dc51cc6e97fd73e325ce94983c0.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
sdhci: make sure to clear the error interrupt
mmc: at91_mci: wakeup on card insertion (or removal)
mmc: add maintainer for at91
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f49c5563f060..773c732b4177 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -651,7 +651,12 @@ W: http://linux-atm.sourceforge.net S: Maintained ATMEL AT91 MCI DRIVER -S: Orphan +P: Nicolas Ferre +M: nicolas.ferre@rfo.atmel.com +L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +W: http://www.atmel.com/products/AT91/ +W: http://www.at91.com/ +S: Maintained ATMEL MACB ETHERNET DRIVER P: Haavard Skinnemoen |