diff options
author | David S. Miller <davem@davemloft.net> | 2012-09-21 13:49:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-21 13:50:16 -0400 |
commit | e0c7a4a1a6c4ace4a176b95cb5089f55452c625e (patch) | |
tree | d35dc4bb27212b27a9696d43f5b7b50a67396bbc /net/bluetooth/cmtp/sock.c | |
parent | dc9c9759ebc65d886453c335b2b5be39f87ab01e (diff) | |
parent | ab04c8bd423edb03e2148350a091836c196107fc (diff) | |
download | op-kernel-dev-e0c7a4a1a6c4ace4a176b95cb5089f55452c625e.zip op-kernel-dev-e0c7a4a1a6c4ace4a176b95cb5089f55452c625e.tar.gz |
Merge branch 'fixes-for-3.6' of git://gitorious.org/linux-can/linux-can
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>
Diffstat (limited to 'net/bluetooth/cmtp/sock.c')
0 files changed, 0 insertions, 0 deletions