aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPekka J Enberg <penberg@cs.Helsinki.FI>2005-09-10 03:26:51 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-10 13:06:29 -0400
commitb3358a116c25267446a45e4164cb2b8e98276da0 (patch)
treee27961fdcfee3eea017fe7f114d8f2246192da40
parentaeb8397b6a289a358f04fa12b69194af6c259ad6 (diff)
[PATCH] update FSF address in COPYING
FSF has moved so update the address as per http://www.gnu.org/licenses/gpl.txt. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--COPYING4
1 files changed, 2 insertions, 2 deletions
diff --git a/COPYING b/COPYING
index 2a7e338ec2fc..ca442d313d86 100644
--- a/COPYING
+++ b/COPYING
@@ -18,7 +18,7 @@
18 Version 2, June 1991 18 Version 2, June 1991
19 19
20 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 20 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
21 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 21 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
22 Everyone is permitted to copy and distribute verbatim copies 22 Everyone is permitted to copy and distribute verbatim copies
23 of this license document, but changing it is not allowed. 23 of this license document, but changing it is not allowed.
24 24
@@ -321,7 +321,7 @@ the "copyright" line and a pointer to where the full notice is found.
321 321
322 You should have received a copy of the GNU General Public License 322 You should have received a copy of the GNU General Public License
323 along with this program; if not, write to the Free Software 323 along with this program; if not, write to the Free Software
324 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 324 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
325 325
326 326
327Also add information on how to contact you by electronic and paper mail. 327Also add information on how to contact you by electronic and paper mail.