| commit | fb78cdbbf4d534ffcf64c386c151187f5f475202 | |
| author | David S. Miller <davem@davemloft.net> | |
| Thu, 25 Oct 2012 03:16:49 +0000 (24 23:16 -0400) | ||
| committer | David S. Miller <davem@davemloft.net> | |
| Thu, 25 Oct 2012 03:16:49 +0000 (24 23:16 -0400) | ||
| tree | 6c5cfec97653de80589230cedae7de080b115074 | treesnapshot (tar.gz zip) |
| parent | 14edd87dc67311556f1254a8f29cf4dd6cb5b7d1 | commitdiff |
| parent | fc09e3672ed623f9c8e73ded3cbcd2cfcf304aac | commitdiff |
Merge branch 'fixes-for-3.7' of git://gitorious.org/linux-can/linux-can
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>
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>