2 files changed, 4 insertions, 12 deletions

diff --git a/Documentation/crypto/api-intro.txt b/Documentation/crypto/api-intro.txt
index 5a03a2801d67..e41a79aa71ce 100644
--- a/Documentation/crypto/api-intro.txt
+++ b/Documentation/crypto/api-intro.txt
@@ -193,6 +193,7 @@ Original developers of the crypto algorithms:
   Kartikey Mahendra Bhatt (CAST6)
   Jon Oberheide (ARC4)
   Jouni Malinen (Michael MIC)
+  NTT(Nippon Telegraph and Telephone Corporation) (Camellia)
 
 SHA1 algorithm contributors:
   Jean-Francois Dive
@@ -246,6 +247,9 @@ Tiger algorithm contributors:
 VIA PadLock contributors:
   Michal Ludvig
 
+Camellia algorithm contributors:
+  NTT(Nippon Telegraph and Telephone Corporation) (Camellia)
+
 Generic scatterwalk code by Adam J. Richter <adam@yggdrasil.com>
 
 Please send any credits updates or corrections to:
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 2dc5e5da8f88..4a1d8979ed92 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -186,18 +186,6 @@ Who:	Greg Kroah-Hartman <gregkh@suse.de>
 
 ---------------------------
 
-What:   find_trylock_page
-When:   January 2007
-Why:    The interface no longer has any callers left in the kernel. It
-        is an odd interface (compared with other find_*_page functions), in
-        that it does not take a refcount to the page, only the page lock.
-        It should be replaced with find_get_page or find_lock_page if possible.
-        This feature removal can be reevaluated if users of the interface
-        cannot cleanly use something else.
-Who:    Nick Piggin <npiggin@suse.de>
-
----------------------------
-
 What:   Interrupt only SA_* flags
 When:   Januar 2007
 Why:    The interrupt related SA_* flags are replaced by IRQF_* to move them