]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
Merge branch 'fixes-for-3.6' of git://gitorious.org/linux-can/linux-can
authorDavid S. Miller <davem@davemloft.net>
Fri, 21 Sep 2012 17:49:59 +0000 (13:49 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 Sep 2012 17:50:16 +0000 (13:50 -0400)
Marc Kleine-Budde says:

====================
two patches for the v3.6 release cycle. Ira W. Snyder fixed support for the
older version of the Janz CMOD-IO Carrier Board. I found and fixed an oops in
the ti_hecc driver, which occurs when removing the module if the network
interface is still open.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge