diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-11 21:52:01 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-11 21:52:01 +0900 |
| commit | 92d28828179675176cd90293699b394b6d22ce68 (patch) | |
| tree | a59ab85f275679d36aeea7bc998f0c350569f0f0 /net/xfrm | |
| parent | be234ba93c61927fd881e7c033a1cf31237d2742 (diff) | |
| parent | 4f7116757b4bd99e4ef2636c7d957a6d63035d11 (diff) | |
Merge tag 'linux-can-fixes-for-4.14-20171110' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2017-11-10
this is a pull request for net/master.
The first patch by Richard Schütz for the c_can driver removes the false
indication to support triple sampling for d_can. Gerhard Bertelsmann's
patch for the sun4i driver improves the RX overrun handling. The patch
by Stephane Grosjean for the peak_canfd driver adds the PCI ids for
various new PCIe/M2 interfaces. Marek Vasut's patch for the ifi driver
fix transmitter delay calculation.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
0 files changed, 0 insertions, 0 deletions