Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6

[linux-block.git] / Documentation / input / ff.txt

diff --git a/Documentation/input/ff.txt b/Documentation/input/ff.txt
index 085eb15b45b7c5655d0c8363e19bdde2cf4e4699..ded4d5f53109d13e79aa47e277a7dde674f5c883 100644 (file)
--- a/Documentation/input/ff.txt
+++ b/Documentation/input/ff.txt
@@ -1,5 +1,5 @@
 Force feedback for Linux.
-By Johann Deneux <deneux@ifrance.com> on 2001/04/22.
+By Johann Deneux <johann.deneux@gmail.com> on 2001/04/22.
 Updated by Anssi Hannula <anssi.hannula@gmail.com> on 2006/04/09.
 You may redistribute this file. Please remember to include shape.fig and
 interactive.fig as well.