diff options
| author | David S. Miller <davem@davemloft.net> | 2019-11-22 20:42:11 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-22 20:42:11 +0300 |
| commit | 068299374cc4ef9a1990adda2d66c4afcacd5277 (patch) | |
| tree | d64e7575c3118033c625f20529b0bac5e4e04f45 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | efabb6c6882fa389a2e4ead7d339ad0da5185279 (diff) | |
| parent | 0704c57436947c9f9f6472fd1a5ade41fc4c19d8 (diff) | |
| download | linux-068299374cc4ef9a1990adda2d66c4afcacd5277.tar.xz | |
Merge tag 'linux-can-fixes-for-5.4-20191122' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2019-11-22
this is a pull request of 2 patches for net/master, if possible for the
current release cycle. Otherwise these patches should hit v5.4 via the
stable tree.
Both patches of this pull request target the m_can driver. Pankaj Sharma
fixes the fallout in the m_can_platform part, which appeared with the
introduction of the m_can platform framework.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions