diff options
author | Paul Mackerras <paulus@samba.org> | 2007-05-10 13:08:37 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 13:08:37 +0200 |
commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /include/net/irda/irlan_client.h | |
parent | [POWERPC] CPM_UART: Removed __init from cpm_uart_init_portdesc to fix warning (diff) | |
parent | Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/rolan... (diff) | |
download | linux-2ecf042ef530dd0943e41d84b6344f507941af3e.tar.xz linux-2ecf042ef530dd0943e41d84b6344f507941af3e.zip |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/net/irda/irlan_client.h')
-rw-r--r-- | include/net/irda/irlan_client.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/irda/irlan_client.h b/include/net/irda/irlan_client.h index 736dabe211e3..fa8455eda280 100644 --- a/include/net/irda/irlan_client.h +++ b/include/net/irda/irlan_client.h @@ -16,7 +16,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. * |