diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-11 11:00:32 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-11 11:00:32 +0000 |
| commit | 36d7dcf6dab2bb500f3d1b008c8c7514aaf82f5d (patch) | |
| tree | 772faf9b1b8e082d3ad23975c02b36762fc4685a /Documentation | |
| parent | f29f0d584a935d6e311337af420ff525a7a4627e (diff) | |
| parent | 315443293a2d0d7c183ca6dd4624d9e4f8a7054a (diff) | |
Merge tag 'v5.4.78' into 5.4-2.3.x-imx
This is the 5.4.78 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/networking/j1939.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/j1939.rst b/Documentation/networking/j1939.rst index f5be243d250a..4b0db514b201 100644 --- a/Documentation/networking/j1939.rst +++ b/Documentation/networking/j1939.rst @@ -414,8 +414,8 @@ Send: .can_family = AF_CAN, .can_addr.j1939 = { .name = J1939_NO_NAME; - .pgn = 0x30, - .addr = 0x12300, + .addr = 0x30, + .pgn = 0x12300, }, }; |