diff options
author | David S. Miller <davem@davemloft.net> | 2014-05-30 17:32:53 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-30 17:32:53 -0700 |
commit | 554215c5ca08d196ed48a66693e7fc6e5f81f00e (patch) | |
tree | 6864b785b01025cb2e320de55f1721ba1c9b7777 /net | |
parent | net/mlx4_core: Reset RoCE VF gids when guest driver goes down (diff) | |
parent | can: only rename enabled led triggers when changing the netdev name (diff) | |
download | linux-dev-554215c5ca08d196ed48a66693e7fc6e5f81f00e.tar.xz linux-dev-554215c5ca08d196ed48a66693e7fc6e5f81f00e.zip |
Merge tag 'linux-can-fixes-for-3.15-20140528' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2014-05-28
here's a pull request for v3.15, hope it's not too late.
Oliver Hartkopp fixed a bug in the CAN led trigger device renaming code.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions