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/networking/ray_cs.txt | |
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/networking/ray_cs.txt')
-rw-r--r-- | Documentation/networking/ray_cs.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/ray_cs.txt b/Documentation/networking/ray_cs.txt index 145d27a52395..c0c12307ed9d 100644 --- a/Documentation/networking/ray_cs.txt +++ b/Documentation/networking/ray_cs.txt | |||
@@ -13,8 +13,8 @@ wireless LAN cards. | |||
13 | 13 | ||
14 | As of kernel 2.3.18, the ray_cs driver is part of the Linux kernel | 14 | As of kernel 2.3.18, the ray_cs driver is part of the Linux kernel |
15 | source. My web page for the development of ray_cs is at | 15 | source. My web page for the development of ray_cs is at |
16 | http://world.std.com/~corey/raylink.html and I can be emailed at | 16 | http://web.ralinktech.com/ralink/Home/Support/Linux.html |
17 | corey@world.std.com | 17 | and I can be emailed at corey@world.std.com |
18 | 18 | ||
19 | The kernel driver is based on ray_cs-1.62.tgz | 19 | The kernel driver is based on ray_cs-1.62.tgz |
20 | 20 | ||