diff options
| author | James Morris <jmorris@namei.org> | 2009-05-08 09:56:47 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-08 09:56:47 +0200 |
| commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
| tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /Documentation/video4linux/zr364xx.txt | |
| parent | integrity: remove __setup auditing msgs (diff) | |
| parent | NOMMU: Don't check vm_region::vm_start is page aligned in add_nommu_region() (diff) | |
| download | linux-d254117099d711f215e62427f55dfb8ebd5ad011.tar.xz linux-d254117099d711f215e62427f55dfb8ebd5ad011.zip | |
Merge branch 'master' into next
Diffstat (limited to 'Documentation/video4linux/zr364xx.txt')
| -rw-r--r-- | Documentation/video4linux/zr364xx.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/video4linux/zr364xx.txt b/Documentation/video4linux/zr364xx.txt index 5c81e3ae6458..7f3d1955d214 100644 --- a/Documentation/video4linux/zr364xx.txt +++ b/Documentation/video4linux/zr364xx.txt @@ -65,3 +65,4 @@ Vendor Product Distributor Model 0x06d6 0x003b Trust Powerc@m 970Z 0x0a17 0x004e Pentax Optio 50 0x041e 0x405d Creative DiVi CAM 516 +0x08ca 0x2102 Aiptek DV T300 |