aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/i82593.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-18 12:23:07 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-18 12:23:07 -0800
commite67b23c71cb9ee02d65a74c3858716ba2dedd554 (patch)
tree17cfeadd37b93ca758aa3ffb61e02edf62289aea /drivers/net/wireless/i82593.h
parentd4bf205305a9188894ac4e2e9875e42f9f8eabfd (diff)
parentf7492f17f2123f0f4db5f9e8ba89867a7b352658 (diff)
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/wireless/i82593.h')
-rw-r--r--drivers/net/wireless/i82593.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/net/wireless/i82593.h b/drivers/net/wireless/i82593.h
index 33acb8add4d6..afac5c7a323d 100644
--- a/drivers/net/wireless/i82593.h
+++ b/drivers/net/wireless/i82593.h
@@ -7,11 +7,16 @@
*
* Copyright 1994, Anders Klemets <klemets@it.kth.se>
*
- * This software may be freely distributed for noncommercial purposes
- * as long as this notice is retained.
- *
* HISTORY
* i82593.h,v
+ * Revision 1.4 2005/11/4 09:15:00 baroniunas
+ * Modified copyright with permission of author as follows:
+ *
+ * "If I82539.H is the only file with my copyright statement
+ * that is included in the Source Forge project, then you have
+ * my approval to change the copyright statement to be a GPL
+ * license, in the way you proposed on October 10."
+ *
* Revision 1.1 1996/07/17 15:23:12 root
* Initial revision
*