diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-14 21:58:45 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-14 21:58:45 -0600 |
| commit | 1895621dbd8ab81d0545392d3b9dc64a9f3b4593 (patch) | |
| tree | e3eb7ee9b5f9d8341a1c4b2c0dc5f135f59b6ef6 /linux/Documentation | |
| parent | bb379778f6c9c6aa4dc340c342d5e81a0b9026dd (diff) | |
| parent | 49c7ae95a0e651f7e2186509d62e7eb21ff6154c (diff) | |
| download | mediapointer-dvb-s2-1895621dbd8ab81d0545392d3b9dc64a9f3b4593.tar.gz mediapointer-dvb-s2-1895621dbd8ab81d0545392d3b9dc64a9f3b4593.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/Documentation')
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.saa7134 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134 index 421a2427f..8c7195455 100644 --- a/linux/Documentation/video4linux/CARDLIST.saa7134 +++ b/linux/Documentation/video4linux/CARDLIST.saa7134 @@ -91,3 +91,4 @@ 90 -> Kworld ATSC110 [17de:7350] 91 -> AVerMedia A169 B [1461:7360] 92 -> AVerMedia A169 B1 [1461:6360] + 93 -> Medion 7134 Bridge #2 [16be:0005] |