diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:22:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:22:43 -0400 |
| commit | 55faed1e607a24ca7f3453a3eb463ca8987f8139 (patch) | |
| tree | 70c1f910576713e799b5b409d9f4c3c56840526e /drivers/net/iseries_veth.c | |
| parent | 946e91f36e90eea46758dd725b1c3b239f270f68 (diff) | |
| parent | 0edd5b44913cd0aba6f23b626b407f70bb3fb018 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-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 |