diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-08 23:56:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-08 23:56:41 +0200 |
| commit | 4dd565134ece7e5d528d4c5288879310c54419e9 (patch) | |
| tree | e08910d2d0feae0c030f8f01acc9b03eb760ad9a /Documentation/video4linux/gspca.txt | |
| parent | ipvs: Remove stray file left over from ipvs move (diff) | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| download | linux-4dd565134ece7e5d528d4c5288879310c54419e9.tar.xz linux-4dd565134ece7e5d528d4c5288879310c54419e9.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
Diffstat (limited to 'Documentation/video4linux/gspca.txt')
| -rw-r--r-- | Documentation/video4linux/gspca.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt index 0f03900c48fb..9a3e4d797fa8 100644 --- a/Documentation/video4linux/gspca.txt +++ b/Documentation/video4linux/gspca.txt @@ -190,6 +190,7 @@ pac7311 093a:260f SnakeCam pac7311 093a:2621 PAC731x pac7311 093a:2624 PAC7302 pac7311 093a:2626 Labtec 2200 +pac7311 093a:262a Webcam 300k zc3xx 0ac8:0302 Z-star Vimicro zc0302 vc032x 0ac8:0321 Vimicro generic vc0321 vc032x 0ac8:0323 Vimicro Vc0323 |