diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-22 22:42:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-22 22:42:25 -0400 |
| commit | 3f8a2b746e3aece61f9c4714b86d1484d66461f0 (patch) | |
| tree | 6702a2dde309d87b15c4a1c9b03adfb6a496786c /net/sched/act_police.c | |
| parent | 13322f2e664333b40ea7c71df8785e6f4bba1e68 (diff) | |
| parent | 3a73aeff37c2e425b11d19c19e42e8269d58d417 (diff) | |
Merge tag 'linux-can-next-for-3.18-20140820' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says:
====================
pull-request: can-next 2014-08-20
this is a pull request of 10 patches for net-next/master.
There is one patch by Wolfram Sang to clean up the build system.
Two patches by Stefan Agner that add vf610 support to the flexcan
driver. Dong Aisheng add support for bosch's m_can core, which is found
in the new freescale ARM SoCs. Sergei Shtylyov improves the rcar_can
driver by supporting all input clocks and adding device tree support.
The next patch is a small cleanup for the bit rate calculation function
by Lad, Prabhakar. And finally a patch by Himangi Saraogi, which
converts the mcp251x driver to use dmam_alloc_coherent.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/act_police.c')
0 files changed, 0 insertions, 0 deletions