summaryrefslogtreecommitdiffstats
path: root/drivers/net/macvtap.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-04-26 18:30:33 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2017-04-26 18:30:33 +0200
commitea3a8596a0b394c63f9692ef5ea4fb6fc2ff91aa (patch)
treec15e9f4517f2865a4246395c5624c9a222af81e4 /drivers/net/macvtap.c
parentMerge tag 'arc-4.11-final' of git://git.kernel.org/pub/scm/linux/kernel/git/v... (diff)
parentMerge tag 'asoc-fix-v4.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
downloadlinux-ea3a8596a0b394c63f9692ef5ea4fb6fc2ff91aa.tar.xz
linux-ea3a8596a0b394c63f9692ef5ea4fb6fc2ff91aa.zip
Merge tag 'sound-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "Since we got a bonus week, let me try to screw a few pending fixes. A slightly large fix is the locking fix in ASoC STI driver, but it's pretty board-specific, and the risk is fairly low. All the rest are small / trivial fixes, mostly marked as stable, for ALSA sequencer core, ASoC topology, ASoC Intel bytcr and Firewire drivers" * tag 'sound-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ASoC: intel: Fix PM and non-atomic crash in bytcr drivers ALSA: firewire-lib: fix inappropriate assignment between signed/unsigned type ALSA: seq: Don't break snd_use_lock_sync() loop by timeout ASoC: topology: Fix to store enum text values ASoC: STI: Fix null ptr deference in IRQ handler ALSA: oxfw: fix regression to handle Stanton SCS.1m/1d
Diffstat (limited to 'drivers/net/macvtap.c')
0 files changed, 0 insertions, 0 deletions