diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 21:10:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 21:10:03 -0400 |
| commit | 5c4c1489b93c9dc51cc6e97fd73e325ce94983c0 (patch) | |
| tree | 16dc1628d614b882bb36fa57bdc88b1d30a83711 /MAINTAINERS | |
| parent | c2e68052429fdf87702fccd272951282bef1c60a (diff) | |
| parent | 964f9ce2ff42dc47cf40fbd2f5c81cd60689e384 (diff) | |
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 | |||
| 651 | S: Maintained | 651 | S: Maintained |
| 652 | 652 | ||
| 653 | ATMEL AT91 MCI DRIVER | 653 | ATMEL AT91 MCI DRIVER |
| 654 | S: Orphan | 654 | P: Nicolas Ferre |
| 655 | M: nicolas.ferre@rfo.atmel.com | ||
| 656 | L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) | ||
| 657 | W: http://www.atmel.com/products/AT91/ | ||
| 658 | W: http://www.at91.com/ | ||
| 659 | S: Maintained | ||
| 655 | 660 | ||
| 656 | ATMEL MACB ETHERNET DRIVER | 661 | ATMEL MACB ETHERNET DRIVER |
| 657 | P: Haavard Skinnemoen | 662 | P: Haavard Skinnemoen |