diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 17:16:35 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 17:16:35 +0100 |
| commit | 759b650f54ed13e9b3d6c064c763a72ee09c74dd (patch) | |
| tree | 173f08e5432e169c00a40a4d2296d965fe8f9c22 /drivers/ide | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| parent | [IA64] Count disabled cpus as potential hot-pluggable CPUs (diff) | |
| download | linux-759b650f54ed13e9b3d6c064c763a72ee09c74dd.tar.xz linux-759b650f54ed13e9b3d6c064c763a72ee09c74dd.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/pci/sgiioc4.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index 2b286e865163..43b96e298363 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c @@ -13,11 +13,6 @@ * License along with this program; if not, write the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * - * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, - * Mountain View, CA 94043, or: - * - * http://www.sgi.com - * * For further information regarding this notice, see: * * http://oss.sgi.com/projects/GenInfo/NoticeExplan |