diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-30 16:38:39 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-30 16:38:39 -0500 |
| commit | 0d29ed28da63dd893395c343c7e78b078de93ceb (patch) | |
| tree | bd8c1e88f2ed53a20dfe9a502d878716da861675 /net/xfrm/xfrm_sysctl.c | |
| parent | 2b89ed65a6f201a6a4f0450ad289aa4bf491608c (diff) | |
| parent | a06393ed03167771246c4c43192d9c264bc48412 (diff) | |
Merge tag 'linux-can-fixes-for-4.10-20170130' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2017-01-30
this is a pull request of one patch.
The patch is by Oliver Hartkopp and fixes the hrtimer/tasklet termination in
bcm op removal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_sysctl.c')