diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 23:20:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 23:20:01 -0800 |
| commit | d669af9d5afb5bdb629f78d024b35e507465f570 (patch) | |
| tree | 711ab23d69098fa05973b69efbd0ae61cc7ff927 /Documentation | |
| parent | 2ddb55f091a9c74a297d72b50f8310c0c8ed7d1d (diff) | |
| parent | f87d09be8c2c270b83c2ad80d06206a7306e2fa9 (diff) | |
| download | linux-d669af9d5afb5bdb629f78d024b35e507465f570.tar.gz linux-d669af9d5afb5bdb629f78d024b35e507465f570.tar.bz2 linux-d669af9d5afb5bdb629f78d024b35e507465f570.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/video4linux/CARDLIST.tuner | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner index 0bf3d5bf9ef8..f6d0cf7b7922 100644 --- a/Documentation/video4linux/CARDLIST.tuner +++ b/Documentation/video4linux/CARDLIST.tuner @@ -68,3 +68,4 @@ tuner=66 - LG NTSC (TALN mini series) tuner=67 - Philips TD1316 Hybrid Tuner tuner=68 - Philips TUV1236D ATSC/NTSC dual in tuner=69 - Tena TNF 5335 MF +tuner=70 - Samsung TCPN 2121P30A |