From: David S. Miller Date: Wed, 8 Aug 2012 22:55:02 +0000 (-0700) Subject: Merge branch 'fixes-for-3.6' of git://gitorious.org/linux-can/linux-can X-Git-Tag: MMI-PSA29.97-13-9~16149^2~25 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d933d2beb1e416f62bf56fe002e5451414f9a9d2;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 --- d933d2beb1e416f62bf56fe002e5451414f9a9d2