aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2005-01-09 16:52:36 -0800
committerGreg Kroah-Hartman <greg@kroah.com>2005-01-09 16:52:36 -0800
commite57e50f6a5f4d10c8485bd2affe6c3385dabe2fe (patch)
treea24cc4d0ed37044b8237e6b162108ff69bd12d32 /MAINTAINERS
parent11d7829025bddd70d592061728e62e0419de0349 (diff)
parent9fa0bfe4100de3d4edb293f9a464ae711ff8c9e2 (diff)
downloadhistory-e57e50f6a5f4d10c8485bd2affe6c3385dabe2fe.tar.gz
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/pci-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index da90e2c0a1e9e4..dc68466f8749b5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1747,7 +1747,6 @@ S: Supported
PCI HOTPLUG CORE
P: Greg Kroah-Hartman
M: greg@kroah.com
-M: gregkh@us.ibm.com
S: Supported
PCI HOTPLUG COMPAQ DRIVER