diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-04 07:15:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-04 07:15:56 -0400 |
| commit | 6bbad18a8b18228fa65d73547dfd5efad1515ef8 (patch) | |
| tree | 193e53bc0fa0b01c3c0fab4d3eda23ce84bb1154 /drivers/pci/hotplug/acpiphp_glue.c | |
| parent | fe2a24dfc577a05349a39c6c8a6312818d28bb59 (diff) | |
| parent | efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 (diff) | |
| download | talos-obmc-linux-6bbad18a8b18228fa65d73547dfd5efad1515ef8.tar.gz talos-obmc-linux-6bbad18a8b18228fa65d73547dfd5efad1515ef8.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/pci/hotplug/acpiphp_glue.c')
| -rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
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> * */ |
