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/dvb | |
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/dvb')
-rw-r--r-- | Documentation/dvb/faq.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/dvb/faq.txt b/Documentation/dvb/faq.txt index 2511a335abd6..121832e5d899 100644 --- a/Documentation/dvb/faq.txt +++ b/Documentation/dvb/faq.txt | |||
@@ -76,7 +76,7 @@ Some very frequently asked questions about linuxtv-dvb | |||
76 | the TuxBox CVS many interesting DVB applications and the dBox2 | 76 | the TuxBox CVS many interesting DVB applications and the dBox2 |
77 | DVB source | 77 | DVB source |
78 | 78 | ||
79 | http://sourceforge.net/projects/dvbsak/ | 79 | http://www.linuxtv.org/downloads/ |
80 | DVB Swiss Army Knife library and utilities | 80 | DVB Swiss Army Knife library and utilities |
81 | 81 | ||
82 | http://www.nenie.org/misc/mpsys/ | 82 | http://www.nenie.org/misc/mpsys/ |