diff options
| author | Simon Horman <horms@verge.net.au> | 2008-09-09 19:14:52 -0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-09-09 19:14:52 -0400 |
| commit | c051a0a2c9e283c1123ed3ce65e66e41d2ce5e24 (patch) | |
| tree | 1202d018129ca5538cd98b1e4542b239045c1a2d /drivers/media/dvb/siano/sms-cards.h | |
| parent | e9c0ce232e7a36daae1ca08282609d7f0c57c567 (diff) | |
| parent | 28faa979746b2352cd78a376bf9f52db953bda46 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
Diffstat (limited to 'drivers/media/dvb/siano/sms-cards.h')
| -rw-r--r-- | drivers/media/dvb/siano/sms-cards.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/siano/sms-cards.h b/drivers/media/dvb/siano/sms-cards.h index 83b39bc203fe..c8f3da6f9bc1 100644 --- a/drivers/media/dvb/siano/sms-cards.h +++ b/drivers/media/dvb/siano/sms-cards.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * Copyright (c) 2008 Michael Krufky <mkrufky@linuxtv.org> | 4 | * Copyright (c) 2008 Michael Krufky <mkrufky@linuxtv.org> |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or modify | 6 | * This program is free software; you can redistribute it and/or modify |
| 7 | * it under the terms of the GNU General Public License version 3 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation; | 8 | * published by the Free Software Foundation; |
| 9 | * | 9 | * |
| 10 | * Software distributed under the License is distributed on an "AS IS" | 10 | * Software distributed under the License is distributed on an "AS IS" |