Takashi Iwai 85c24cd8d3 Merge branch 'for-linus' into for-next ...

Merged upstream branch to make further fireworks development easier
(and avoid conflicts earlier).

Conflicts:
	sound/firewire/bebob/bebob_focusrite.c

2014-10-27 14:11:07 +01:00

..

bebob

Merge branch 'for-linus' into for-next

2014-10-27 14:11:07 +01:00

fireworks

ALSA: fireworks: fix specifiers in format strings for propper output

2014-08-05 09:15:20 +02:00

amdtp.c

ALSA: firewire-lib/dice: add arrangements of PCM pointer and interrupts for Dice quirk

2014-08-29 09:52:07 +02:00

amdtp.h

ALSA: firewire-lib/dice: add arrangements of PCM pointer and interrupts for Dice quirk

2014-08-29 09:52:07 +02:00

cmp.c

ALSA: firewire-lib: Fix sparse warning of incorrect type in assignment

2014-05-27 17:34:37 +02:00

cmp.h

ALSA: firewire-lib: Add a new function to check others' connection

2014-05-26 14:22:46 +02:00

dice-interface.h

ALSA: dice: document quadlet alignment

2013-10-20 22:07:57 +02:00

dice.c

ALSA: firewire-lib/dice: add arrangements of PCM pointer and interrupts for Dice quirk

2014-08-29 09:52:07 +02:00

fcp.c

ALSA: firewire-lib: Remove a comment about restriction of asynchronous operation

2014-06-03 08:14:21 +02:00

fcp.h

ALSA: firewire-lib: Add some AV/C general commands

2014-05-26 14:23:13 +02:00

isight.c

ALSA: firewire: Convert to snd_card_new() with a device pointer

2014-02-14 08:13:31 +01:00

iso-resources.c

sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed

2011-10-31 19:31:22 -04:00

iso-resources.h

firewire: octlet AT payloads can be stack-allocated

2011-05-10 22:53:44 +02:00

Kconfig

ALSA: firewire: trivial typo fixes in Kconfig

2014-07-28 10:26:42 +02:00

lib.c

ALSA: firewire: extend snd_fw_transaction()

2013-10-20 22:07:57 +02:00

lib.h

ALSA: firewire: extend snd_fw_transaction()

2013-10-20 22:07:57 +02:00

Makefile

ALSA: bebob: Add skelton for BeBoB based devices

2014-05-26 14:29:12 +02:00

packets-buffer.c

sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed

2011-10-31 19:31:22 -04:00

packets-buffer.h

…

scs1x.c

ALSA: firewire: Convert to snd_card_new() with a device pointer

2014-02-14 08:13:31 +01:00

speakers.c

ALSA: firewire-lib: Add some AV/C general commands

2014-05-26 14:23:13 +02:00