Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 20 Jun 2017 05:53:07 +0000 (07:53 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 20 Jun 2017 05:53:07 +0000 (07:53 +0200)
1  2 
sound/core/pcm_lib.c
sound/firewire/amdtp-stream.c
sound/firewire/amdtp-stream.h

Simple merge
Simple merge
Simple merge