diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 08:16:35 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 08:16:35 -0800 |
commit | 759b650f54ed13e9b3d6c064c763a72ee09c74dd (patch) | |
tree | 173f08e5432e169c00a40a4d2296d965fe8f9c22 /drivers | |
parent | 69454e6991091d0d6eb7461653f2695d985e1a74 (diff) | |
parent | 8f8b1138fc9f65e3591aac83a4ee394fef34ac1d (diff) | |
download | lwn-759b650f54ed13e9b3d6c064c763a72ee09c74dd.tar.gz lwn-759b650f54ed13e9b3d6c064c763a72ee09c74dd.zip |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'drivers')
-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 |