projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14edd87 fc09e36)
Merge branch 'fixes-for-3.7' of git://gitorious.org/linux-can/linux-can
authorDavid S. Miller <davem@davemloft.net>
Thu, 25 Oct 2012 03:16:49 +0000 (23:16 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 25 Oct 2012 03:16:49 +0000 (23:16 -0400)
Marc Kleine-Budde says:

====================
here are two patches for the v3.7 release cycle. A patch by Wolfgang Grandegger
for the flexcan driver, which switches off a workaround on the imx6q that is
not needed, because the hardware is not affected by that bug. And a patch by
Stephane Grosjean which updates the pci device table for the peak pci sja1000
====================

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

Trivial merge