diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-09 20:52:36 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-09 20:52:36 +0200 |
| commit | a736e074680745faa5dc6be8dd3c58ad4850aab9 (patch) | |
| tree | 620e6d20cfce3806399fbefa8d911cc848463f9b /net/can/proc.c | |
| parent | Merge branch 'Add-support-for-XGMAC2-in-stmmac' (diff) | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert... (diff) | |
| download | linux-a736e074680745faa5dc6be8dd3c58ad4850aab9.tar.xz linux-a736e074680745faa5dc6be8dd3c58ad4850aab9.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Overlapping changes in RXRPC, changing to ktime_get_seconds() whilst
adding some tracepoints.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can/proc.c')
0 files changed, 0 insertions, 0 deletions