diff options
author | David S. Miller <davem@davemloft.net> | 2016-12-02 14:02:13 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-12-02 14:02:13 -0500 |
commit | f0d21e894713b43a75bdf2d1b31e587bd5db5341 (patch) | |
tree | 00bdf05d9139fba688125ece1e2cc592440b1bb7 /net/tipc/bearer.h | |
parent | 50d5aa4cf822887f88841e4d8f8502434af679a9 (diff) | |
parent | f00b534ded60bd0a23c2fa8dec4ece52aa7d235f (diff) | |
download | linux-f0d21e894713b43a75bdf2d1b31e587bd5db5341.tar.bz2 |
Merge tag 'linux-can-fixes-for-4.9-20161201' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2016-12-02
this is a pull request for net/master.
There are two patches by Stephane Grosjean, who adds support for the new
PCAN-USB X6 USB interface to the pcan_usb driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/bearer.h')
0 files changed, 0 insertions, 0 deletions