diff options
| author | Patrick Mochel <mochel@osdl.org> | 2003-09-24 18:36:16 -0700 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2003-09-24 18:36:16 -0700 |
| commit | b71aebdf785c99a97e9cfdb704da4acc7df601a3 (patch) | |
| tree | 35b512be5f0e003e72b1327b9cf546402a234fee /include | |
| parent | 53f2011513be7d4cf8316fe0c00a75d54558b5f2 (diff) | |
| parent | 4cad6adc26c3ef2f5ec45dd014aab3cf7b8d87dd (diff) | |
Merge osdl.org:/home/mochel/src/kernel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/linux-2.5-power
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/edd.h | 2 | ||||
| -rw-r--r-- | include/linux/pci-dynids.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/edd.h b/include/asm-i386/edd.h index 66f7246dd13c..3bae533f3d2f 100644 --- a/include/asm-i386/edd.h +++ b/include/asm-i386/edd.h @@ -1,6 +1,6 @@ /* * linux/include/asm-i386/edd.h - * Copyright (C) 2002 Dell Computer Corporation + * Copyright (C) 2002 Dell Inc. * by Matt Domsch <Matt_Domsch@dell.com> * * structures and definitions for the int 13h, ax={41,48}h diff --git a/include/linux/pci-dynids.h b/include/linux/pci-dynids.h index a88652da88f6..183b6b0de81c 100644 --- a/include/linux/pci-dynids.h +++ b/include/linux/pci-dynids.h @@ -1,6 +1,6 @@ /* * PCI defines and function prototypes - * Copyright 2003 Dell Computer Corporation + * Copyright 2003 Dell Inc. * by Matt Domsch <Matt_Domsch@dell.com> */ |