From: Steven Rostedt <rostedt@goodmis.org>
Date: Thu, 31 Jul 2008 16:40:52 +0000 (-0400)
Subject: dual license ftrace.txt
X-Git-Tag: v2.6.27-rc2~80
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a97762a77f927577525868e39661084170ce3605;p=linux-2.6-omap-h63xx.git

dual license ftrace.txt

I asked legal about the licensing of ftrace.txt, and they told me that,
unless the Documentation directory is specifically set up to handle non
GPL licenses (which it does not appear to be), then it would be best to
put ftrace.txt under the GPL.

This patch adds a dual license to ftrace.txt such that it is under both
the FDL and the GPL.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/Documentation/ftrace.txt b/Documentation/ftrace.txt
index f218f616ff6..d330fe3103d 100644
--- a/Documentation/ftrace.txt
+++ b/Documentation/ftrace.txt
@@ -4,6 +4,7 @@
 Copyright 2008 Red Hat Inc.
    Author:   Steven Rostedt <srostedt@redhat.com>
   License:   The GNU Free Documentation License, Version 1.2
+               (dual licensed under the GPL v2)
 Reviewers:   Elias Oltmanns, Randy Dunlap, Andrew Morton,
 	     John Kacur, and David Teigland.