diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-07-14 15:15:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-07-14 15:15:07 +0200 |
| commit | d5585d6d3e2db78dbca48b2b9537dd9abd8b4cae (patch) | |
| tree | 413e7ba7d023b674be23b8bf5284ecd3d24232b1 /Documentation | |
| parent | 7d442d2c13f0bd263f516733c50126ce6f1e85c7 (diff) | |
| parent | 1c5474a65bf15a4cb162dfff86d6d0b5a08a740c (diff) | |
Merge branch 'for-linus' into for-next
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 9b2e0dd6017e..e67c1db96854 100644 --- a/Documentation/video4linux/CARDLIST.tuner +++ b/Documentation/video4linux/CARDLIST.tuner @@ -82,3 +82,4 @@ tuner=81 - Partsnic (Daewoo) PTI-5NF05 tuner=82 - Philips CU1216L tuner=83 - NXP TDA18271 tuner=84 - Sony BTF-Pxn01Z +tuner=85 - Philips FQ1236 MK5 |