diff options
| author | James Morris <jmorris@namei.org> | 2008-09-22 04:41:56 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-09-22 04:41:56 +0400 |
| commit | ab2b49518e743962f71b94246855c44ee9cf52cc (patch) | |
| tree | 26b260a350f0a0a0d19b558bf147b812e3a1564c /Documentation/video4linux/CARDLIST.au0828 | |
| parent | f058925b201357fba48d56cc9c1719ae274b2022 (diff) | |
| parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
| download | linux-ab2b49518e743962f71b94246855c44ee9cf52cc.tar.xz | |
Merge branch 'master' into next
Conflicts:
MAINTAINERS
Thanks for breaking my tree :-)
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'Documentation/video4linux/CARDLIST.au0828')
| -rw-r--r-- | Documentation/video4linux/CARDLIST.au0828 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.au0828 b/Documentation/video4linux/CARDLIST.au0828 index eedc399e8deb..aa05e5bb22fb 100644 --- a/Documentation/video4linux/CARDLIST.au0828 +++ b/Documentation/video4linux/CARDLIST.au0828 @@ -3,3 +3,4 @@ 2 -> Hauppauge HVR850 (au0828) [2040:7240] 3 -> DViCO FusionHDTV USB (au0828) [0fe9:d620] 4 -> Hauppauge HVR950Q rev xxF8 (au0828) [2040:7201,2040:7211,2040:7281] + 5 -> Hauppauge Woodbury (au0828) [2040:8200] |