summaryrefslogtreecommitdiffstats
path: root/net/tipc/zone.h
diff options
context:
space:
mode:
authorPer Liden <per.liden@nospam.ericsson.com>2006-01-11 13:30:43 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-12 14:06:36 -0800
commit9ea1fd3c1a15c620d1e3d0aa269d34b705477003 (patch)
treeef16b1720df86d3cb4927f8426ebebb24d0717ea /net/tipc/zone.h
parentea714ccda5d5858ee677a77cf33dbaf34a0060c3 (diff)
downloadlinux-9ea1fd3c1a15c620d1e3d0aa269d34b705477003.tar.gz
linux-9ea1fd3c1a15c620d1e3d0aa269d34b705477003.tar.bz2
linux-9ea1fd3c1a15c620d1e3d0aa269d34b705477003.zip
[TIPC] License header update
The license header in each file now more clearly state that this code is licensed under a dual BSD/GPL. Before this was only evident if you looked at the MODULE_LICENSE line in core.c. Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
Diffstat (limited to 'net/tipc/zone.h')
-rw-r--r--net/tipc/zone.h20
1 files changed, 12 insertions, 8 deletions
diff --git a/net/tipc/zone.h b/net/tipc/zone.h
index 19fd51a8bd2b..e05cc6102043 100644
--- a/net/tipc/zone.h
+++ b/net/tipc/zone.h
@@ -9,14 +9,18 @@
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the names of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE