projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 99aa347 035534e)
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)
commitd933d2beb1e416f62bf56fe002e5451414f9a9d2
treec224370c9dee10a70f13624dd970b5dc27bcd5f3tree | snapshot
parent99aa3473e672ca610905838997fa018b95cd643fcommit | diff
parent035534ed3377d9def2c17717899fd64a111a785bcommit | diff
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>
John Crispins staging tree