summaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/pciehp.h
diff options
context:
space:
mode:
authorSteve French2005-08-21 06:40:00 +0200
committerSteve French2005-08-21 06:40:00 +0200
commit646352319b6cd369750a706706810d87f6b6efa7 (patch)
treee7830e1276cbad7d29bf9471def4b8940592c3b7 /drivers/pci/hotplug/pciehp.h
parent[CIFS] Finish cifs mount option which requests case insensitive path (diff)
parentDon't allow normal users to set idle IO priority (diff)
downloadkernel-qcow2-linux-646352319b6cd369750a706706810d87f6b6efa7.tar.gz
kernel-qcow2-linux-646352319b6cd369750a706706810d87f6b6efa7.tar.xz
kernel-qcow2-linux-646352319b6cd369750a706706810d87f6b6efa7.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/pci/hotplug/pciehp.h')
-rw-r--r--drivers/pci/hotplug/pciehp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 46b294a12418..2b92b9e8c910 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -23,7 +23,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * Send feedback to <greg@kroah.com>, <dely.l.sy@intel.com>
+ * Send feedback to <greg@kroah.com>, <kristen.c.accardi@intel.com>
*
*/
#ifndef _PCIEHP_H