diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /drivers/net/iseries_veth.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'drivers/net/iseries_veth.c')
| -rw-r--r-- | drivers/net/iseries_veth.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index dc5d089bf184..3d56cf5a4e23 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * Copyright (C) 2001 Kyle A. Lucke (klucke@us.ibm.com), IBM Corp. | 4 | * Copyright (C) 2001 Kyle A. Lucke (klucke@us.ibm.com), IBM Corp. |
| 5 | * Substantially cleaned up by: | 5 | * Substantially cleaned up by: |
| 6 | * Copyright (C) 2003 David Gibson <dwg@au1.ibm.com>, IBM Corporation. | 6 | * Copyright (C) 2003 David Gibson <dwg@au1.ibm.com>, IBM Corporation. |
| 7 | * Copyright (C) 2004-2005 Michael Ellerman, IBM Corporation. | ||
| 7 | * | 8 | * |
| 8 | * This program is free software; you can redistribute it and/or | 9 | * This program is free software; you can redistribute it and/or |
| 9 | * modify it under the terms of the GNU General Public License as | 10 | * modify it under the terms of the GNU General Public License as |