diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-08 09:09:11 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 09:09:11 +0200 |
| commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
| tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /drivers/pci/hotplug | |
| parent | [POWERPC] Update lppaca offset comments (diff) | |
| parent | [POWERPC] Fix might-sleep warning on removing cpus (diff) | |
| download | linux-32bc6e095d75233e7c87cc6fa0e07942b124d194.tar.xz linux-32bc6e095d75233e7c87cc6fa0e07942b124d194.zip | |
Merge branch 'merge'
Diffstat (limited to 'drivers/pci/hotplug')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_core.c | 3 | ||||
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 2 |
2 files changed, 2 insertions, 3 deletions
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 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <gregkh@us.ibm.com>, - * <t-kochi@bq.jp.nec.com> + * Send feedback to <kristen.c.accardi@intel.com> * */ 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 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <t-kochi@bq.jp.nec.com> + * Send feedback to <kristen.c.accardi@intel.com> * */ |