Merge tag 'linux-can-fixes-for-4.2-20150825' of git://git.kernel.org/pub/scm/linux...
authorDavid S. Miller <davem@davemloft.net>
Tue, 25 Aug 2015 23:12:45 +0000 (16:12 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 Aug 2015 23:12:45 +0000 (16:12 -0700)
commite732cdd416cb85fdba6919af2e271c64c08bb26d
tree43c97c9cc26bf944d9b5e4a9b29080d26d373d59
parent83bc805bff89854e4c81c67633a52ce1015b1502
parent06b23f7fbbf26a025fd68395c7586949db586b47
Merge tag 'linux-can-fixes-for-4.2-20150825' of git://git./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>