diff options
| author | David S. Miller <davem@davemloft.net> | 2019-09-05 09:57:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-05 09:57:31 +0200 |
| commit | b06b39927249dad12e965d4f9914e58c83d87cf0 (patch) | |
| tree | 36b54bbf90a19f0e23788df897d87f7622d238a5 /drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | |
| parent | f4d7c8e3da9173ac7b0498abc3aab0d320efe997 (diff) | |
| parent | 13ecee77fa810b21beaf3023e921525c55f88b04 (diff) | |
Merge tag 'linux-can-next-for-5.4-20190903' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2019-09-03
this is a pull request for net-next/master consisting of 15 patches.
The first patch is by Christer Beskow, targets the kvaser_pciefd driver
and fixes the PWM generator's frequency.
The next three patches are by Dan Murphy, the tcan4x5x is updated to use
a proper interrupts/interrupt-parent DT binding to specify the devices
IRQ line. Further the unneeded wake ups of the device is removed from
the driver.
A patch by me for the mcp25xx driver removes the deprecated board file
setup example. Three patches by Andy Shevchenko simplify clock handling,
update the driver from OF to device property API and simplify the
mcp251x_can_suspend() function.
The remaining 7 patches are by me and clean up checkpatch warnings in
the generic CAN device infrastructure.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c')
0 files changed, 0 insertions, 0 deletions