summaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorPekka J Enberg <penberg@cs.Helsinki.FI>2005-09-10 09:26:51 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-10 19:06:29 +0200
commitb3358a116c25267446a45e4164cb2b8e98276da0 (patch)
treee27961fdcfee3eea017fe7f114d8f2246192da40 /COPYING
parent[PATCH] i386/smpboot: use msleep() instead of schedule_timeout() (diff)
downloadlinux-b3358a116c25267446a45e4164cb2b8e98276da0.tar.xz
linux-b3358a116c25267446a45e4164cb2b8e98276da0.zip
[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>
Diffstat (limited to 'COPYING')
-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 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -321,7 +321,7 @@ the "copyright" line and a pointer to where the full notice is found.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.