diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 11:16:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 11:16:35 -0500 |
| commit | 759b650f54ed13e9b3d6c064c763a72ee09c74dd (patch) | |
| tree | 173f08e5432e169c00a40a4d2296d965fe8f9c22 /drivers/ide | |
| parent | 69454e6991091d0d6eb7461653f2695d985e1a74 (diff) | |
| parent | 8f8b1138fc9f65e3591aac83a4ee394fef34ac1d (diff) | |
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 @@ | |||
| 13 | * License along with this program; if not, write the Free Software | 13 | * License along with this program; if not, write the Free Software |
| 14 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | 14 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. |
| 15 | * | 15 | * |
| 16 | * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, | ||
| 17 | * Mountain View, CA 94043, or: | ||
| 18 | * | ||
| 19 | * http://www.sgi.com | ||
| 20 | * | ||
| 21 | * For further information regarding this notice, see: | 16 | * For further information regarding this notice, see: |
| 22 | * | 17 | * |
| 23 | * http://oss.sgi.com/projects/GenInfo/NoticeExplan | 18 | * http://oss.sgi.com/projects/GenInfo/NoticeExplan |