diff options
author | David S. Miller <davem@davemloft.net> | 2012-08-08 22:55:02 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-08 22:55:02 (GMT) |
commit | d933d2beb1e416f62bf56fe002e5451414f9a9d2 (patch) | |
tree | c224370c9dee10a70f13624dd970b5dc27bcd5f3 /net/ipv4/fib_trie.c | |
parent | 99aa3473e672ca610905838997fa018b95cd643f (diff) | |
parent | 035534ed3377d9def2c17717899fd64a111a785b (diff) | |
download | linux-fsl-qoriq-d933d2beb1e416f62bf56fe002e5451414f9a9d2.tar.xz |
Merge branch 'fixes-for-3.6' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says:
====================
here's a fix intended for the v3.6 release cycle. Oliver noticed and
fixed that the flags definition for the new canfd_frame contains
redundant and confusing information.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_trie.c')
0 files changed, 0 insertions, 0 deletions