diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-07-15 17:39:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-07-15 17:39:39 -0700 |
| commit | 725b70185d6b4ae73dc563725a95a0c10e242df5 (patch) | |
| tree | 35d241f6a643ca85ec9e50a66b5d55e6b984303f /drivers/net/ppp/ppp_generic.c | |
| parent | net-timestamp: document deprecated syststamp (diff) | |
| parent | can: sja1000: Add support for CAN_CTRLMODE_PRESUME_ACK (diff) | |
| download | linux-dev-725b70185d6b4ae73dc563725a95a0c10e242df5.tar.xz linux-dev-725b70185d6b4ae73dc563725a95a0c10e242df5.zip | |
Merge tag 'linux-can-next-for-3.17-20140715' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2014-07-15
this is a pull request of 4 patches for net-next/master.
Prabhakar Lad contributes a patch that converts the c_can driver to use
the devm api. The remaining four patches by Nikita Edward Baruzdin
improve the SJA1000 driver with loopback testing support and introduce
a new testing mode presume ack, for successful transmission even if no
ACK is received.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ppp/ppp_generic.c')
0 files changed, 0 insertions, 0 deletions