diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 502f2dd761eb..f0358cd91de3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2291,8 +2291,7 @@ F: drivers/scsi/eata_pio.* | |||
2291 | 2291 | ||
2292 | EBTABLES | 2292 | EBTABLES |
2293 | M: Bart De Schuymer <bart.de.schuymer@pandora.be> | 2293 | M: Bart De Schuymer <bart.de.schuymer@pandora.be> |
2294 | L: ebtables-user@lists.sourceforge.net | 2294 | L: netfilter-devel@vger.kernel.org |
2295 | L: ebtables-devel@lists.sourceforge.net | ||
2296 | W: http://ebtables.sourceforge.net/ | 2295 | W: http://ebtables.sourceforge.net/ |
2297 | S: Maintained | 2296 | S: Maintained |
2298 | F: include/linux/netfilter_bridge/ebt_*.h | 2297 | F: include/linux/netfilter_bridge/ebt_*.h |
@@ -7007,6 +7006,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86. | |||
7007 | S: Maintained | 7006 | S: Maintained |
7008 | F: drivers/platform/x86 | 7007 | F: drivers/platform/x86 |
7009 | 7008 | ||
7009 | X86 MCE INFRASTRUCTURE | ||
7010 | M: Tony Luck <tony.luck@intel.com> | ||
7011 | M: Borislav Petkov <bp@amd64.org> | ||
7012 | L: linux-edac@vger.kernel.org | ||
7013 | S: Maintained | ||
7014 | F: arch/x86/kernel/cpu/mcheck/* | ||
7015 | |||
7010 | XEN HYPERVISOR INTERFACE | 7016 | XEN HYPERVISOR INTERFACE |
7011 | M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 7017 | M: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> |
7012 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 7018 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |