Merge branch 'fixes-for-3.6' of git://gitorious.org/linux-can/linux-can
authorDavid S. Miller <davem@davemloft.net>
Wed, 8 Aug 2012 22:55:02 +0000 (15:55 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Aug 2012 22:55:02 +0000 (15:55 -0700)
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>

Trivial merge