projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c63650 c523530)
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Sep 2012 22:46:29 +0000 (18:46 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Sep 2012 22:46:29 +0000 (18:46 -0400)
commit24cad1b4ce9e9da6ec22cfc9361bbbe0ba4f80cc
tree75b54b9c0003e33140fa08119a5886bcebef500btree | snapshot (tar.gz zip)
parent6c636503260d1a5598f44f940f284cf679dc38f9commit | diff
parentc523530ce17defe6b28ccfe622c506488f430866commit | diff
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 <davem@davemloft.net>