aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/shpchp_ctrl.c
diff options
context:
space:
mode:
authorDave Kleikamp <shaggy@austin.ibm.com>2005-08-19 11:37:59 -0400
committerDave Kleikamp <shaggy@austin.ibm.com>2005-08-19 11:37:59 -0400
commit01fa90cb2f0b664bc86d9aff807f4ea7f09e2e7f (patch)
tree5c290dcd84389e8a5bacc052bf61ea89ac02a4fb /drivers/pci/hotplug/shpchp_ctrl.c
parent686762c8049457a6255ad5caf9275c100fbaceb6 (diff)
parent2ad56496627630ebc99f06af5f81ca23e17e014e (diff)
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/pci/hotplug/shpchp_ctrl.c')
-rw-r--r--drivers/pci/hotplug/shpchp_ctrl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index 490a9553a062..783b5abb0717 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -23,7 +23,7 @@
23 * along with this program; if not, write to the Free Software 23 * along with this program; if not, write to the Free Software
24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 * 25 *
26 * Send feedback to <greg@kroah.com>, <dely.l.sy@intel.com> 26 * Send feedback to <greg@kroah.com>, <kristen.c.accardi@intel.com>
27 * 27 *
28 */ 28 */
29 29