[PATCH] skge, sky2, et all. gplv2 only

[PATCH] skge, sky2, et all. gplv2 only

[Stephen Hemminger]

I don't want my code to downgraded to GPLv3 because of
cut-n-pasted the comments. These files which I hold copyright
on were started before it was clear what GPLv3 was going to be.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

--- linux-2.6.orig/drivers/net/irda/stir4200.c	2006-10-22 20:12:25.000000000 -0700
+++ linux-2.6/drivers/net/irda/stir4200.c	2006-10-22 20:12:33.000000000 -0700
@@ -15,8 +15,7 @@
 *
 *	This program is free software; you can redistribute it and/or modify
 *	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation; either version 2 of the License, or
-*	(at your option) any later version.
+*	the Free Software Foundation; either version 2 of the License.
 *
 *	This program is distributed in the hope that it will be useful,
 *	but WITHOUT ANY WARRANTY; without even the implied warranty of
--- linux-2.6.orig/drivers/net/skge.c	2006-10-22 20:11:36.000000000 -0700
+++ linux-2.6/drivers/net/skge.c	2006-10-22 20:11:50.000000000 -0700
@@ -11,8 +11,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; either version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
--- linux-2.6.orig/drivers/net/sky2.c	2006-10-22 20:11:14.000000000 -0700
+++ linux-2.6/drivers/net/sky2.c	2006-10-22 20:11:31.000000000 -0700
@@ -10,8 +10,7 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; either version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
--- linux-2.6.orig/net/sched/sch_netem.c	2006-10-22 20:12:04.000000000 -0700
+++ linux-2.6/net/sched/sch_netem.c	2006-10-22 20:12:11.000000000 -0700
@@ -4,7 +4,7 @@
  * 		This program is free software; you can redistribute it and/or
  * 		modify it under the terms of the GNU General Public License
  * 		as published by the Free Software Foundation; either version
- * 		2 of the License, or (at your option) any later version.
+ * 		2 of the License.
  *
  *  		Many of the algorithms and ideas for this came from
  *		NIST Net which is not copyrighted. 

Re: [PATCH] skge, sky2, et all. gplv2 only

[Jeff Garzik]

Stephen Hemminger wrote:
> I don't want my code to downgraded to GPLv3 because of
> cut-n-pasted the comments. These files which I hold copyright
> on were started before it was clear what GPLv3 was going to be.
> 
> Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

applied to #upstream-fixes