aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci/hotplug/shpchprm_acpi.c
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2005-08-19 10:37:59 -0500
committerDave Kleikamp <shaggy@austin.ibm.com>2005-08-19 10:37:59 -0500
commit01fa90cb2f0b664bc86d9aff807f4ea7f09e2e7f (patch)
tree5c290dcd84389e8a5bacc052bf61ea89ac02a4fb /drivers/pci/hotplug/shpchprm_acpi.c
parent686762c8049457a6255ad5caf9275c100fbaceb6 (diff)
parent2ad56496627630ebc99f06af5f81ca23e17e014e (diff)
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/pci/hotplug/shpchprm_acpi.c')
-rw-r--r--drivers/pci/hotplug/shpchprm_acpi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/shpchprm_acpi.c b/drivers/pci/hotplug/shpchprm_acpi.c
index 7957cdc72cd..d37b31658ed 100644
--- a/drivers/pci/hotplug/shpchprm_acpi.c
+++ b/drivers/pci/hotplug/shpchprm_acpi.c
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * Send feedback to <dely.l.sy@intel.com>
+ * Send feedback to <kristen.c.accardi@intel.com>
*
*/