diff options
author | David S. Miller <davem@davemloft.net> | 2018-08-09 11:52:36 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-08-09 11:52:36 -0700 |
commit | a736e074680745faa5dc6be8dd3c58ad4850aab9 (patch) | |
tree | 620e6d20cfce3806399fbefa8d911cc848463f9b /net/psample/Kconfig | |
parent | 192e91d244e376b32d90ffbf78c87a0fb35a4040 (diff) | |
parent | 112cbae26d18e75098d95cc234cfa5059de8d479 (diff) | |
download | linux-a736e074680745faa5dc6be8dd3c58ad4850aab9.tar.bz2 |
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/psample/Kconfig')
0 files changed, 0 insertions, 0 deletions