aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax/isdnhdlc.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-10-20 00:26:44 -0400
committerSteve French <sfrench@us.ibm.com>2007-10-20 00:26:44 -0400
commit748c5151deb56e4b7b5a9b07a884243764933831 (patch)
treee9dd45b8806d00b56503cfa55c46f3ebce0d151c /drivers/isdn/hisax/isdnhdlc.c
parent4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff)
parente8b8c977734193adedf2b0f607d6252c78e86394 (diff)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/isdn/hisax/isdnhdlc.c')
-rw-r--r--drivers/isdn/hisax/isdnhdlc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/isdnhdlc.c b/drivers/isdn/hisax/isdnhdlc.c
index 268dced6c34a..c69a77a80062 100644
--- a/drivers/isdn/hisax/isdnhdlc.c
+++ b/drivers/isdn/hisax/isdnhdlc.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * isdnhdlc.c -- General purpose ISDN HDLC decoder. 2 * isdnhdlc.c -- General purpose ISDN HDLC decoder.
3 * 3 *
4 *Copyright (C) 2002 Wolfgang Mües <wolfgang@iksw-muees.de> 4 *Copyright (C) 2002 Wolfgang Mües <wolfgang@iksw-muees.de>
5 * 2001 Frode Isaksen <fisaksen@bewan.com> 5 * 2001 Frode Isaksen <fisaksen@bewan.com>
6 * 2001 Kai Germaschewski <kai.germaschewski@gmx.de> 6 * 2001 Kai Germaschewski <kai.germaschewski@gmx.de>
7 * 7 *
@@ -27,7 +27,7 @@
27 27
28/*-------------------------------------------------------------------*/ 28/*-------------------------------------------------------------------*/
29 29
30MODULE_AUTHOR("Wolfgang Mües <wolfgang@iksw-muees.de>, " 30MODULE_AUTHOR("Wolfgang Mües <wolfgang@iksw-muees.de>, "
31 "Frode Isaksen <fisaksen@bewan.com>, " 31 "Frode Isaksen <fisaksen@bewan.com>, "
32 "Kai Germaschewski <kai.germaschewski@gmx.de>"); 32 "Kai Germaschewski <kai.germaschewski@gmx.de>");
33MODULE_DESCRIPTION("General purpose ISDN HDLC decoder"); 33MODULE_DESCRIPTION("General purpose ISDN HDLC decoder");