diff options
author | 2015-08-25 16:12:45 -0700 | |
---|---|---|
committer | 2015-08-25 16:12:45 -0700 | |
commit | e732cdd416cb85fdba6919af2e271c64c08bb26d (patch) | |
tree | 43c97c9cc26bf944d9b5e4a9b29080d26d373d59 /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | net: compile renesas directory if NET_VENDOR_RENESAS is configured (diff) | |
parent | can: pcan_usb: don't provide CAN FD bittimings by non-FD adapters (diff) | |
download | wireguard-linux-e732cdd416cb85fdba6919af2e271c64c08bb26d.tar.xz wireguard-linux-e732cdd416cb85fdba6919af2e271c64c08bb26d.zip |
Merge tag 'linux-can-fixes-for-4.2-20150825' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
this is the updated pull request of one patch by me for the peak_usb
driver. It fixes the driver, so that non FD adapters don't provide CAN
FD bittimings.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions