diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-19 17:34:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-19 17:34:25 -0400 |
| commit | afbe7af1b22fcd5d128e36ab0faa6bd7d7d78223 (patch) | |
| tree | 1c50b26f47d35eff618c7adb014886f964925314 /drivers/hwmon/Makefile | |
| parent | 9b67aa4a82492f128adfccc63e61ab57c1ce1dfd (diff) | |
| parent | e77980e50bc2850599d4d9c0192b67a9ffd6daac (diff) | |
| download | linux-afbe7af1b22fcd5d128e36ab0faa6bd7d7d78223.tar.gz linux-afbe7af1b22fcd5d128e36ab0faa6bd7d7d78223.tar.bz2 linux-afbe7af1b22fcd5d128e36ab0faa6bd7d7d78223.zip | |
Merge tag 'linux-can-fixes-for-3.17-20140918' of git://gitorious.org/linux-can/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2014-09-18
this is a pull request of 8 patches for current net.
A patch by Roger Quadros for the c_can driver fixes the swapped parameters of
the c_can_hw_raminit_ti() function. Oliver Hartkopp adds the missing PCI ids to
the peak_pci driver to support the single channel PCAN ExpressCard 34 adapter.
David Dueck converts the at91_can driver to use proper clock handling
functions. Then there are 5 patches by David Jander and me which fix several
mailbox related problems in the flexcan driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/hwmon/Makefile')
0 files changed, 0 insertions, 0 deletions