diff --git a/[refs] b/[refs]
index 6ee23b7efd52..283b6b0eb00d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 784dd7b64ca661722f539db906d56ce54906f2fb
+refs/heads/master: a97762a77f927577525868e39661084170ce3605
diff --git a/trunk/Documentation/ftrace.txt b/trunk/Documentation/ftrace.txt
index f218f616ff6b..d330fe3103da 100644
--- a/trunk/Documentation/ftrace.txt
+++ b/trunk/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.