From: David S. Miller <davem@davemloft.net>
Date: Thu, 5 Feb 2015 08:29:14 +0000 (-0800)
Subject: Merge tag 'linux-can-next-for-3.20-20150204' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=adfde05166174ef1c4733dd7cfd4dc2b5f710ac8;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'linux-can-next-for-3.20-20150204' of git://git./linux/kernel/git/mkl/linux-can-next

Marc Kleine-Budde says:

====================
pull-request: can-next 2015-02-04

this is a pull request of 2 patches for net-next/master.

Nicholas Mc Guire contributes a patch for the janz-ican3 driver to fix
a mismatch in an assignment. Ahmed S. Darwish contributes a patch for
the kvaser_usb driver, to make the driver more robust during the
bus-off handling.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

adfde05166174ef1c4733dd7cfd4dc2b5f710ac8