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)
commit7fc8e7c1d9787ab8cb0f91adb3bc9c2c64c00ef8
tree6c5c7d9e05ef0d494265ef924ac909c959101fba
parent8cad7a3db658a0652e4ced46dc44fbc7872f0823
parentc7ecb9068e6772c43941ce609f08bc53f36e1dce
Merge branch 'for-linus' into for-next
sound/core/pcm_lib.c
sound/firewire/amdtp-stream.c
sound/firewire/amdtp-stream.h