diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 16:55:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 16:55:15 -0700 |
| commit | 6681ba7ec480bc839584fd0817991d248b4b9e44 (patch) | |
| tree | 994fb1de40d58ce8dac821cf1fec727e2f902f47 /MAINTAINERS | |
| parent | 06ef93e1b8405acac6ec900564e3ad1a8e3a72b2 (diff) | |
| parent | 4d096ca7e65584dd5845e64c6400f920e694f672 (diff) | |
| download | linux-stable-6681ba7ec480bc839584fd0817991d248b4b9e44.tar.gz linux-stable-6681ba7ec480bc839584fd0817991d248b4b9e44.tar.bz2 linux-stable-6681ba7ec480bc839584fd0817991d248b4b9e44.zip | |
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
* 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac: (21 commits)
MAINTAINERS: add an entry for Edac Sandy Bridge driver
edac: tag sb_edac as EXPERIMENTAL, as it requires more testing
EDAC: Fix incorrect edac mode reporting in sb_edac
edac: sb_edac: Add it to the building system
edac: Add an experimental new driver to support Sandy Bridge CPU's
i7300_edac: Fix error cleanup logic
i7core_edac: Initialize memory name with cpu, channel, bank
i7core_edac: Fix compilation on 32 bits arch
i7core_edac: scrubbing fixups
EDAC: Correct Kconfig dependencies
i7core_edac: return -ENODEV if no MC is found
i7core_edac: use edac's own way to print errors
MAINTAINERS: remove dropped edac_mce.* from the file
i7core_edac: Drop the edac_mce facility
x86, MCE: Use notifier chain only for MCE decoding
EDAC i7core: Use mce socketid for better compatibility
i7core_edac: Don't enable memory scrubbing for Xeon 35xx
i7core_edac: Add scrubbing support
edac: Move edac main structs to include/linux/edac.h
i7core_edac: Fix oops when trying to inject errors
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7f21e31996e2..4cb8c51b4792 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2467,8 +2467,6 @@ L: linux-edac@vger.kernel.org W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/i7core_edac.c -F: drivers/edac/edac_mce.c -F: include/linux/edac_mce.h EDAC-I82975X M: Ranganathan Desikan <ravi@jetztechnologies.com> @@ -2492,6 +2490,13 @@ W: bluesmoke.sourceforge.net S: Maintained F: drivers/edac/r82600_edac.c +EDAC-SBRIDGE +M: Mauro Carvalho Chehab <mchehab@redhat.com> +L: linux-edac@vger.kernel.org +W: bluesmoke.sourceforge.net +S: Maintained +F: drivers/edac/sb_edac.c + EDIROL UA-101/UA-1000 DRIVER M: Clemens Ladisch <clemens@ladisch.de> L: alsa-devel@alsa-project.org (moderated for non-subscribers) |