diff options
| author | Per Liden <per.liden@nospam.ericsson.com> | 2006-01-11 07:30:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-12 17:06:36 -0500 |
| commit | 9ea1fd3c1a15c620d1e3d0aa269d34b705477003 (patch) | |
| tree | ef16b1720df86d3cb4927f8426ebebb24d0717ea /net/tipc/net.h | |
| parent | ea714ccda5d5858ee677a77cf33dbaf34a0060c3 (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 'net/tipc/net.h')
| -rw-r--r-- | net/tipc/net.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/net/tipc/net.h b/net/tipc/net.h index 50098455a89..97650ff6359 100644 --- a/net/tipc/net.h +++ b/net/tipc/net.h | |||
| @@ -8,15 +8,19 @@ | |||
| 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 | * | ||
| 21 | * Alternatively, this software may be distributed under the terms of the | ||
| 22 | * GNU General Public License ("GPL") version 2 as published by the Free | ||
| 23 | * Software Foundation. | ||
| 20 | * | 24 | * |
| 21 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 25 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
| 22 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 26 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |