diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-09-08 14:27:13 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 14:27:13 -0700 |
| commit | 344a076110f4ecb16ea6d286b63be696604982ed (patch) | |
| tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 /drivers/net/iseries_veth.c | |
| parent | 9b17e7e74e767d8a494a74c3c459aeecd1e08c5f (diff) | |
| parent | 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff) | |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
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 @@ * Copyright (C) 2001 Kyle A. Lucke (klucke@us.ibm.com), IBM Corp. * Substantially cleaned up by: * Copyright (C) 2003 David Gibson <dwg@au1.ibm.com>, IBM Corporation. + * Copyright (C) 2004-2005 Michael Ellerman, IBM Corporation. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as |