summaryrefslogtreecommitdiff
path: root/tools/vm
diff options
context:
space:
mode:
Diffstat (limited to 'tools/vm')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 04:42:04 +0000
/linux/net-next.git/tree/sound/pci/sonicvibes.c?id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>sound/pci/sonicvibes.c parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/pci/sonicvibes.c')