From: David S. Miller Date: Fri, 28 Sep 2012 22:46:29 +0000 (-0400) Subject: Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=24cad1b4ce9e9da6ec22cfc9361bbbe0ba4f80cc;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next Marc Kleine-Budde says: ==================== this pull request is for net-next, for the v3.7 release cycle. AnilKumar Ch contributed a fix for a segfault in the c_can driver, which is triggered by an earlier commit [1] in net-next (so no backport is needed). ... [1] 4cdd34b can: c_can: Add runtime PM support to Bosch C_CAN/D_CAN controller ==================== Signed-off-by: David S. Miller --- 24cad1b4ce9e9da6ec22cfc9361bbbe0ba4f80cc