diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /Documentation/video4linux/CARDLIST.cx23885 | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'Documentation/video4linux/CARDLIST.cx23885')
| -rw-r--r-- | Documentation/video4linux/CARDLIST.cx23885 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885 index 91aa3c0f0dd2..450b8f8c389b 100644 --- a/Documentation/video4linux/CARDLIST.cx23885 +++ b/Documentation/video4linux/CARDLIST.cx23885 | |||
| @@ -16,3 +16,8 @@ | |||
| 16 | 15 -> TeVii S470 [d470:9022] | 16 | 15 -> TeVii S470 [d470:9022] |
| 17 | 16 -> DVBWorld DVB-S2 2005 [0001:2005] | 17 | 16 -> DVBWorld DVB-S2 2005 [0001:2005] |
| 18 | 17 -> NetUP Dual DVB-S2 CI [1b55:2a2c] | 18 | 17 -> NetUP Dual DVB-S2 CI [1b55:2a2c] |
| 19 | 18 -> Hauppauge WinTV-HVR1270 [0070:2211] | ||
| 20 | 19 -> Hauppauge WinTV-HVR1275 [0070:2215] | ||
| 21 | 20 -> Hauppauge WinTV-HVR1255 [0070:2251] | ||
| 22 | 21 -> Hauppauge WinTV-HVR1210 [0070:2291,0070:2295] | ||
| 23 | 22 -> Mygica X8506 DMB-TH [14f1:8651] | ||