summaryrefslogtreecommitdiffstats
path: root/net/irda/irlan/irlan_provider.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-10-20 04:26:44 +0000
committerSteve French <sfrench@us.ibm.com>2007-10-20 04:26:44 +0000
commit748c5151deb56e4b7b5a9b07a884243764933831 (patch)
treee9dd45b8806d00b56503cfa55c46f3ebce0d151c /net/irda/irlan/irlan_provider.c
parent4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff)
parente8b8c977734193adedf2b0f607d6252c78e86394 (diff)
downloadtalos-obmc-linux-748c5151deb56e4b7b5a9b07a884243764933831.tar.gz
talos-obmc-linux-748c5151deb56e4b7b5a9b07a884243764933831.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/irda/irlan/irlan_provider.c')
-rw-r--r--net/irda/irlan/irlan_provider.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c
index aac66434e473..13db942812e4 100644
--- a/net/irda/irlan/irlan_provider.c
+++ b/net/irda/irlan/irlan_provider.c
@@ -20,7 +20,7 @@
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
- * Neither Dag Brattli nor University of Tromsř admit liability nor
+ * Neither Dag Brattli nor University of Tromsø admit liability nor
* provide warranty for any of this software. This material is
* provided "AS-IS" and at no charge.
*
OpenPOWER on IntegriCloud