Merge branch 'topic/firewire-update' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 29 Sep 2015 10:52:07 +0000 (12:52 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 29 Sep 2015 10:52:07 +0000 (12:52 +0200)
commitd8dfacf8b50c260d79864933ac82a8198a0908a9
treeb172eb8643de7bd9f9439c58031b06c98116d86a
parente87359efcaf45efc41dbaa6ec25eb26705300cee
parentdf075feefbd347f13fba5198294cda619532c237
Merge branch 'topic/firewire-update' into for-next
drivers/gpu/drm/i915/intel_audio.c
drivers/spi/spi-atmel.c
sound/firewire/oxfw/oxfw-stream.c
sound/firewire/oxfw/oxfw.h