diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 20:44:25 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 20:44:25 (GMT) |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /Documentation/networking/README.ipw2200 | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
| download | linux-fsl-qoriq-1c01a80cfec6f806246f31ff2680cd3639b30e67.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'Documentation/networking/README.ipw2200')
| -rw-r--r-- | Documentation/networking/README.ipw2200 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/README.ipw2200 b/Documentation/networking/README.ipw2200 index 616a8e5..b7658be 100644 --- a/Documentation/networking/README.ipw2200 +++ b/Documentation/networking/README.ipw2200 @@ -256,7 +256,7 @@ You can set the debug level via: Where $VALUE would be a number in the case of this sysfs entry. The input to sysfs files does not have to be a number. For example, the -firmware loader used by hotplug utilizes sysfs entries for transfering +firmware loader used by hotplug utilizes sysfs entries for transferring the firmware image from user space into the driver. The Intel(R) PRO/Wireless 2915ABG Driver for Linux exposes sysfs entries |