From: David S. Miller Date: Thu, 25 Oct 2012 03:16:49 +0000 (-0400) Subject: Merge branch 'fixes-for-3.7' of git://gitorious.org/linux-can/linux-can X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fb78cdbbf4d534ffcf64c386c151187f5f475202;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 --- fb78cdbbf4d534ffcf64c386c151187f5f475202