diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-04 20:12:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-04 20:12:06 -0700 |
| commit | 62fd98571727a22ef77f1a9c1637260ad5a10baa (patch) | |
| tree | 0b0118c028b5de70ba42d45f18b08cd7cea96dad /MAINTAINERS | |
| parent | 404504470177d5ca1b46db5197ee0b78d639a2eb (diff) | |
| parent | 67c8931677090540e31b4f816e5fe315ff51f262 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core:
MAINTAINERS: Add an entry for i7core_edac
i7core_edac: Avoid doing multiple probes for the same card
i7core_edac: Properly discover the first QPI device
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7642365ed6d..a07a49deb47 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2111,11 +2111,18 @@ F: drivers/edac/i5000_edac.c EDAC-I5400 M: Mauro Carvalho Chehab <mchehab@redhat.com> -L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers) +L: linux-edac@vger.kernel.org W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/i5400_edac.c +EDAC-I7CORE +M: Mauro Carvalho Chehab <mchehab@redhat.com> +L: linux-edac@vger.kernel.org +W: bluesmoke.sourceforge.net +S: Maintained +F: drivers/edac/i7core_edac.c linux/edac_mce.h drivers/edac/edac_mce.c + EDAC-I82975X M: Ranganathan Desikan <ravi@jetztechnologies.com> M: "Arvind R." <arvind@jetztechnologies.com> |