summaryrefslogtreecommitdiff
path: root/net/ipv6/ip6_fib.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-09-28 22:46:29 (GMT)
committerDavid S. Miller <davem@davemloft.net>2012-09-28 22:46:29 (GMT)
commit24cad1b4ce9e9da6ec22cfc9361bbbe0ba4f80cc (patch)
tree75b54b9c0003e33140fa08119a5886bcebef500b /net/ipv6/ip6_fib.c
parent6c636503260d1a5598f44f940f284cf679dc38f9 (diff)
parentc523530ce17defe6b28ccfe622c506488f430866 (diff)
downloadlinux-fsl-qoriq-24cad1b4ce9e9da6ec22cfc9361bbbe0ba4f80cc.tar.xz
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>
Diffstat (limited to 'net/ipv6/ip6_fib.c')
0 files changed, 0 insertions, 0 deletions