summaryrefslogtreecommitdiffstats
path: root/sound/pci/sis7019.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-08-07 03:44:57 +0200
committerDavid S. Miller <davem@davemloft.net>2019-08-07 03:44:57 +0200
commit13dfb3fa494361ea9a5950f27c9cd8b06d28c04f (patch)
tree1bf30874f57c6c6b21160a10282191fcd0868055 /sound/pci/sis7019.h
parentMerge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe... (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff)
downloadlinux-13dfb3fa494361ea9a5950f27c9cd8b06d28c04f.tar.xz
linux-13dfb3fa494361ea9a5950f27c9cd8b06d28c04f.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/pci/sis7019.h')
0 files changed, 0 insertions, 0 deletions