From: David S. Miller <davem@davemloft.net>
Date: Tue, 25 Aug 2015 23:12:45 +0000 (-0700)
Subject: Merge tag 'linux-can-fixes-for-4.2-20150825' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: firefly_0821_release~176^2~1230^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e732cdd416cb85fdba6919af2e271c64c08bb26d;p=firefly-linux-kernel-4.4.55.git

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>
---

e732cdd416cb85fdba6919af2e271c64c08bb26d