diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 01:01:43 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-30 01:01:43 +0200 |
| commit | da61396d24e37258817e42537c482e962b4742f7 (patch) | |
| tree | 4293a5d557b8f9fed8a2bac93f1e5c939c7b65c3 /drivers/pci/hotplug/shpchprm_acpi.c | |
| parent | Merge /spare/repo/linux-2.6/ (diff) | |
| parent | Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jg... (diff) | |
| download | linux-da61396d24e37258817e42537c482e962b4742f7.tar.xz linux-da61396d24e37258817e42537c482e962b4742f7.zip | |
Merge upstream kernel into libata 'passthru' branch
Diffstat (limited to 'drivers/pci/hotplug/shpchprm_acpi.c')
| -rw-r--r-- | drivers/pci/hotplug/shpchprm_acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/shpchprm_acpi.c b/drivers/pci/hotplug/shpchprm_acpi.c index 7957cdc72cd0..d37b31658edf 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> * */ |