diff options
| author | David S. Miller | 2017-12-29 21:14:27 +0100 |
|---|---|---|
| committer | David S. Miller | 2017-12-29 21:42:26 +0100 |
| commit | 6bb8824732f69de0f233ae6b1a8158e149627b38 (patch) | |
| tree | 78642311a28f42df9042da41eb98652c39d51327 /sound/soc/soc-cache.c | |
| parent | Merge tag 'mlx5-shared-4.16-1' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-6bb8824732f69de0f233ae6b1a8158e149627b38.tar.gz kernel-qcow2-linux-6bb8824732f69de0f233ae6b1a8158e149627b38.tar.xz kernel-qcow2-linux-6bb8824732f69de0f233ae6b1a8158e149627b38.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
net/ipv6/ip6_gre.c is a case of parallel adds.
include/trace/events/tcp.h is a little bit more tricky. The removal
of in-trace-macro ifdefs in 'net' paralleled with moving
show_tcp_state_name and friends over to include/trace/events/sock.h
in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/soc/soc-cache.c')
0 files changed, 0 insertions, 0 deletions