diff options
| -rw-r--r-- | MAINTAINERS | 6 | ||||
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_core.c | 3 | ||||
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 32aa30d1504a..bac3f706f75e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -214,6 +214,12 @@ W: http://acpi.sourceforge.net/ | |||
| 214 | T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git | 214 | T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git |
| 215 | S: Maintained | 215 | S: Maintained |
| 216 | 216 | ||
| 217 | ACPI PCI HOTPLUG DRIVER | ||
| 218 | P: Kristen Carlson Accardi | ||
| 219 | M: kristen.c.accardi@intel.com | ||
| 220 | L: pcihpd-discuss@lists.sourceforge.net | ||
| 221 | S: Maintained | ||
| 222 | |||
| 217 | AD1816 SOUND DRIVER | 223 | AD1816 SOUND DRIVER |
| 218 | P: Thorsten Knabe | 224 | P: Thorsten Knabe |
| 219 | M: Thorsten Knabe <linux@thorsten-knabe.de> | 225 | M: Thorsten Knabe <linux@thorsten-knabe.de> |
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c index 34de5697983d..e2fef60c2d06 100644 --- a/drivers/pci/hotplug/acpiphp_core.c +++ b/drivers/pci/hotplug/acpiphp_core.c | |||
| @@ -27,8 +27,7 @@ | |||
| 27 | * along with this program; if not, write to the Free Software | 27 | * along with this program; if not, write to the Free Software |
| 28 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 28 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 29 | * | 29 | * |
| 30 | * Send feedback to <gregkh@us.ibm.com>, | 30 | * Send feedback to <kristen.c.accardi@intel.com> |
| 31 | * <t-kochi@bq.jp.nec.com> | ||
| 32 | * | 31 | * |
| 33 | */ | 32 | */ |
| 34 | 33 | ||
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index ef95d12fb32c..ae67a8f55ba1 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | * along with this program; if not, write to the Free Software | 26 | * along with this program; if not, write to the Free Software |
| 27 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 27 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 28 | * | 28 | * |
| 29 | * Send feedback to <t-kochi@bq.jp.nec.com> | 29 | * Send feedback to <kristen.c.accardi@intel.com> |
| 30 | * | 30 | * |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
