summaryrefslogtreecommitdiffstats
path: root/include/media/dmxdev.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2018-04-21 22:31:52 +0200
committerDavid S. Miller <davem@davemloft.net>2018-04-21 22:32:48 +0200
commite0ada51db907ed2db5d46ad7ff86a8b5df68e59b (patch)
tree858966cee69ad8a50e59c4e02dcbde6ba2916151 /include/media/dmxdev.h
parentMerge branch 'ipv6-Another-followup-to-the-fib6_info-change' (diff)
parentMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalent... (diff)
downloadlinux-e0ada51db907ed2db5d46ad7ff86a8b5df68e59b.tar.xz
linux-e0ada51db907ed2db5d46ad7ff86a8b5df68e59b.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were simple overlapping changes in microchip driver. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions