diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 12:49:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 12:49:27 +0200 |
| commit | 1389ac4b976abdc0555280dfc1aa2c3abcc19641 (patch) | |
| tree | 1ec51aa0b1e33201f6f4f3bebc657f9ec65f8539 /Documentation/video4linux/gspca.txt | |
| parent | 69e13ad56f9e2cd81c4f8bfd6267211c10c14c08 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/signal
Conflicts:
arch/x86/kernel/signal_64.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 0f03900c48f..9a3e4d797fa 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 |