diff options
| author | David S. Miller <davem@davemloft.net> | 2014-04-02 01:49:50 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-04-02 01:49:50 +0400 |
| commit | f91ca783f11029940aa60a9a5aad4dce666e6414 (patch) | |
| tree | f5ec20b9cbf024eabdfb7862f4fd6d51e31be8ea /Documentation | |
| parent | 7f1f6056f2f7293d5108eda905af42df58b78370 (diff) | |
| parent | b1d8e431bd5639c03ff99d08fd2d5d621969bdc5 (diff) | |
| download | linux-f91ca783f11029940aa60a9a5aad4dce666e6414.tar.xz | |
Merge tag 'linux-can-fixes-for-3.15-20140401' of git://gitorious.org/linux-can/linux-can
linux-can-fixes-for-3.15-20140401
Marc Kleine-Budde says:
====================
this is a pull request of 16 patches for the 3.15 release cycle.
Bjorn Van Tilt contributes a patch which fixes a memory leak in usb_8dev's
usb_8dev_start_xmit()s error path. A patch by Robert Schwebel fixes a typo in
the can documentation. The remaining patches all target the c_can driver. Two
of them are by me; they add a missing netif_napi_del() and return value
checking. Thomas Gleixner contributes 12 patches, which address several
shortcomings in the driver like hardware initialisation, concurrency, message
ordering and poor performance.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/can.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt index 0cbe6ec22d6f..2fa44cbe81b7 100644 --- a/Documentation/networking/can.txt +++ b/Documentation/networking/can.txt @@ -1017,7 +1017,7 @@ solution for a couple of reasons: in case of a bus-off condition after the specified delay time in milliseconds. By default it's off. - "bitrate 125000 sample_point 0.875" + "bitrate 125000 sample-point 0.875" Shows the real bit-rate in bits/sec and the sample-point in the range 0.000..0.999. If the calculation of bit-timing parameters is enabled in the kernel (CONFIG_CAN_CALC_BITTIMING=y), the |