Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus

[firefly-linux-kernel-4.4.55.git] / include / linux / telephony.h

diff --git a/include/linux/telephony.h b/include/linux/telephony.h
index 5b2b6261f193c872631cfeea9c8990e3127d4a8c..f63afe330addaade67b6d9f3e76e8ce569827ce8 100644 (file)
--- a/include/linux/telephony.h
+++ b/include/linux/telephony.h
@@ -14,7 +14,7 @@
  *    Authors:       Ed Okerson, <eokerson@quicknet.net>
  *                   Greg Herlein, <gherlein@quicknet.net>
  *
- *    Contributors:  Alan Cox, <alan@redhat.com>
+ *    Contributors:  Alan Cox, <alan@lxorguk.ukuu.org.uk>
  *                   David W. Erhart, <derhart@quicknet.net>
  *
  * IN NO EVENT SHALL QUICKNET TECHNOLOGIES, INC. BE LIABLE TO ANY PARTY FOR