aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/tipc/tipc.h
diff options
context:
space:
mode:
authorPer Liden <per.liden@nospam.ericsson.com>2006-01-11 07:30:43 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-01-12 17:06:36 -0500
commit9ea1fd3c1a15c620d1e3d0aa269d34b705477003 (patch)
treeef16b1720df86d3cb4927f8426ebebb24d0717ea /include/net/tipc/tipc.h
parentea714ccda5d5858ee677a77cf33dbaf34a0060c3 (diff)
[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 'include/net/tipc/tipc.h')
-rw-r--r--include/net/tipc/tipc.h42
1 files changed, 23 insertions, 19 deletions
diff --git a/include/net/tipc/tipc.h b/include/net/tipc/tipc.h
index 1d4d8d0701e3..b763d556355d 100644
--- a/include/net/tipc/tipc.h
+++ b/include/net/tipc/tipc.h
@@ -6,28 +6,32 @@
6 * Copyright (c) 2005-2006, Ericsson AB 6 * Copyright (c) 2005-2006, Ericsson AB
7 * All rights reserved. 7 * All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions are met: 10 * modification, are permitted provided that the following conditions are met:
11 * 11 *
12 * Redistributions of source code must retain the above copyright notice, this 12 * 1. Redistributions of source code must retain the above copyright
13 * list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * Redistributions in binary form must reproduce the above copyright notice, 14 * 2. Redistributions in binary form must reproduce the above copyright
15 * this list of conditions and the following disclaimer in the documentation 15 * notice, this list of conditions and the following disclaimer in the
16 * and/or other materials provided with the distribution. 16 * documentation and/or other materials provided with the distribution.
17 * Neither the names of the copyright holders nor the names of its 17 * 3. Neither the names of the copyright holders nor the names of its
18 * contributors may be used to endorse or promote products derived from this 18 * contributors may be used to endorse or promote products derived from
19 * software without specific prior written permission. 19 * this software without specific prior written permission.
20 * 20 *
21 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 21 * Alternatively, this software may be distributed under the terms of the
22 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 22 * GNU General Public License ("GPL") version 2 as published by the Free
23 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 23 * Software Foundation.
24 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 24 *
25 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 25 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 30 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
31 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
31 * POSSIBILITY OF SUCH DAMAGE. 35 * POSSIBILITY OF SUCH DAMAGE.
32 */ 36 */
33 37