diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/media/radio/radio-mr800.c | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/media/radio/radio-mr800.c')
| -rw-r--r-- | drivers/media/radio/radio-mr800.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c index a1239083472d..5f79acb56e48 100644 --- a/drivers/media/radio/radio-mr800.c +++ b/drivers/media/radio/radio-mr800.c | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | * http://av-usbradio.sourceforge.net/index.php | 28 | * http://av-usbradio.sourceforge.net/index.php |
| 29 | * http://sourceforge.net/projects/av-usbradio/ | 29 | * http://sourceforge.net/projects/av-usbradio/ |
| 30 | * Latest release of theirs project was in 2005. | 30 | * Latest release of theirs project was in 2005. |
| 31 | * Probably, this driver could be improved trough using their | 31 | * Probably, this driver could be improved through using their |
| 32 | * achievements (specifications given). | 32 | * achievements (specifications given). |
| 33 | * Also, Faidon Liambotis <paravoid@debian.org> wrote nice driver for this radio | 33 | * Also, Faidon Liambotis <paravoid@debian.org> wrote nice driver for this radio |
| 34 | * in 2007. He allowed to use his driver to improve current mr800 radio driver. | 34 | * in 2007. He allowed to use his driver to improve current mr800 radio driver. |