diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-07 17:08:57 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-07 17:08:57 -0500 |
| commit | d03e9d07adc8c3800b82c3f29fd0708f49a836dd (patch) | |
| tree | c8845f8bfa4ddabcaebf662dcfb50d098d9c1a50 /drivers/scsi/ipr.c | |
| parent | a5d5ff572c33acc629779e383f02c048a98859e0 (diff) | |
| parent | dd22586dec4c1444608affd83b1fedd520280ab4 (diff) | |
Merge tag 'linux-can-next-for-3.15-20140307' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2014-02-12
this is a pull request of twelve patches for net-next/master.
Alexander Shiyan contributes two patches for the mcp251x, one making
the driver more quiet and the other one improves the compile time
coverage by removing the #ifdef CONFIG_PM_SLEEP. Then two patches for
the flexcan driver by me, one removing the #ifdef CONFIG_PM_SLEEP, too,
the other one making use of platform_get_device_id(). Another patch by
me which converts the janz-ican3 driver to use netdev_<level>(). The
remaining 7 patches are by Oliver Hartkopp, they add CAN FD support to
the netlink configuration interface.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/ipr.c')
0 files changed, 0 insertions, 0 deletions