diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
| commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
| tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /drivers/scsi/initio.h | |
| parent | e12f0102ac81d660c9f801d0a0e10ccf4537a9de (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'drivers/scsi/initio.h')
| -rw-r--r-- | drivers/scsi/initio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/initio.h b/drivers/scsi/initio.h index cb48efa81fe2..e58af9e95506 100644 --- a/drivers/scsi/initio.h +++ b/drivers/scsi/initio.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * Copyright (c) 1994-1998 Initio Corporation | 4 | * Copyright (c) 1994-1998 Initio Corporation |
| 5 | * All rights reserved. | 5 | * All rights reserved. |
| 6 | * | 6 | * |
| 7 | * Cleanups (c) Copyright 2007 Red Hat <alan@redhat.com> | 7 | * Cleanups (c) Copyright 2007 Red Hat <alan@lxorguk.ukuu.org.uk> |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
| 10 | * it under the terms of the GNU General Public License as published by | 10 | * it under the terms of the GNU General Public License as published by |