diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
| commit | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (patch) | |
| tree | 5adc1ff2eaf64d450bf28bb6b2ce890db2567288 /Documentation/video4linux/bttv/Cards | |
| parent | 5cf65713f87775c548e3eb48dbafa32e12f28000 (diff) | |
| parent | 0ea6e61122196509af82cc4f36cbdaacbefb8227 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
Documentation: update broken web addresses.
fix comment typo "choosed" -> "chosen"
hostap:hostap_hw.c Fix typo in comment
Fix spelling contorller -> controller in comments
Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
fs/Kconfig: Fix typo Userpace -> Userspace
Removing dead MACH_U300_BS26
drivers/infiniband: Remove unnecessary casts of private_data
fs/ocfs2: Remove unnecessary casts of private_data
libfc: use ARRAY_SIZE
scsi: bfa: use ARRAY_SIZE
drm: i915: use ARRAY_SIZE
drm: drm_edid: use ARRAY_SIZE
synclink: use ARRAY_SIZE
block: cciss: use ARRAY_SIZE
comment typo fixes: charater => character
fix comment typos concerning "challenge"
arm: plat-spear: fix typo in kerneldoc
reiserfs: typo comment fix
update email address
...
Diffstat (limited to 'Documentation/video4linux/bttv/Cards')
| -rw-r--r-- | Documentation/video4linux/bttv/Cards | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/video4linux/bttv/Cards b/Documentation/video4linux/bttv/Cards index d3389655ad96..12217fc49725 100644 --- a/Documentation/video4linux/bttv/Cards +++ b/Documentation/video4linux/bttv/Cards | |||
| @@ -802,7 +802,7 @@ Kworld (www.kworld.com.tw) | |||
| 802 | 802 | ||
| 803 | 803 | ||
| 804 | 804 | ||
| 805 | JTT/ Justy Corp.http://www.justy.co.jp/ (www.jtt.com.jp website down) | 805 | JTT/ Justy Corp.(http://www.jtt.ne.jp/) |
| 806 | --------------------------------------------------------------------- | 806 | --------------------------------------------------------------------- |
| 807 | JTT-02 (JTT TV) "TV watchmate pro" (bt848) | 807 | JTT-02 (JTT TV) "TV watchmate pro" (bt848) |
| 808 | 808 | ||
| @@ -828,7 +828,7 @@ Eline www.eline-net.com/ | |||
| 828 | Eline Vision TVMaster / TVMaster FM (ELV-TVM/ ELV-TVM-FM) = LR26 (bt878) | 828 | Eline Vision TVMaster / TVMaster FM (ELV-TVM/ ELV-TVM-FM) = LR26 (bt878) |
| 829 | Eline Vision TVMaster-2000 (ELV-TVM-2000, ELV-TVM-2000-FM)= LR138 (saa713x) | 829 | Eline Vision TVMaster-2000 (ELV-TVM-2000, ELV-TVM-2000-FM)= LR138 (saa713x) |
| 830 | 830 | ||
| 831 | Spirit http://www.spiritmodems.com.au/ | 831 | Spirit |
| 832 | ------ | 832 | ------ |
| 833 | Spirit TV Tuner/Video Capture Card (bt848) | 833 | Spirit TV Tuner/Video Capture Card (bt848) |
| 834 | 834 | ||
| @@ -959,6 +959,6 @@ Asus www.asuscom.com | |||
| 959 | 959 | ||
| 960 | Hoontech | 960 | Hoontech |
| 961 | -------- | 961 | -------- |
| 962 | http://www.hoontech.com/korean/download/down_driver_list03.html | 962 | http://www.hoontech.de/ |
| 963 | HART Vision 848 (H-ART Vision 848) | 963 | HART Vision 848 (H-ART Vision 848) |
| 964 | HART Vision 878 (H-Art Vision 878) | 964 | HART Vision 878 (H-Art Vision 878) |