diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-15 22:24:37 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-15 22:24:37 +0100 |
| commit | ca994a36f585432458ead9133fcfe05440edbb7b (patch) | |
| tree | be05512153a9cd5cbe1f1234bc09fd9cd388ec58 /Documentation/video4linux/CARDLIST.cx23885 | |
| parent | rtlwifi: Modify rtl_pci_init to return 0 on success (diff) | |
| parent | ath9k: stop on rates with idx -1 in ath9k rate control's .tx_status (diff) | |
| download | linux-ca994a36f585432458ead9133fcfe05440edbb7b.tar.xz linux-ca994a36f585432458ead9133fcfe05440edbb7b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/debugfs_sta.c
net/mac80211/sta_info.h
Diffstat (limited to 'Documentation/video4linux/CARDLIST.cx23885')
| -rw-r--r-- | Documentation/video4linux/CARDLIST.cx23885 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885 index 8910449d23a8..23584d0c6a75 100644 --- a/Documentation/video4linux/CARDLIST.cx23885 +++ b/Documentation/video4linux/CARDLIST.cx23885 @@ -29,3 +29,6 @@ 28 -> LEADTEK WinFast PxTV1200 [107d:6f22] 29 -> GoTView X5 3D Hybrid [5654:2390] 30 -> NetUP Dual DVB-T/C-CI RF [1b55:e2e4] + 31 -> Leadtek Winfast PxDVR3200 H XC4000 [107d:6f39] + 32 -> MPX-885 + 33 -> Mygica X8507 [14f1:8502] |