1
0
Fork 0
alistair23-linux/sound/firewire/bebob
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
..
Makefile ALSA: bebob: Add support for M-Audio usual Firewire series 2014-05-26 14:32:03 +02:00
bebob.c ALSA: bebob: Remove meaningless mutex_unlock() 2014-05-27 17:36:11 +02:00
bebob.h ALSA: bebob: More constify text arrays 2014-10-21 08:26:10 +02:00
bebob_command.c ALSA: bebob: Prepare for device specific operations 2014-05-26 14:31:15 +02:00
bebob_focusrite.c Merge branch 'for-linus' into for-next 2014-10-27 14:11:07 +01:00
bebob_hwdep.c ALSA: bebob: Add hwdep interface 2014-05-26 14:31:03 +02:00
bebob_maudio.c ALSA: bebob: Use snd_ctl_enum_info() 2014-10-21 08:26:55 +02:00
bebob_midi.c ALSA: fireworks/bebob: Improve indentation 2014-05-27 17:35:38 +02:00
bebob_pcm.c ALSA: bebob: Prepare for device specific operations 2014-05-26 14:31:15 +02:00
bebob_proc.c ALSA: bebob: Prepare for device specific operations 2014-05-26 14:31:15 +02:00
bebob_stream.c ALSA: bebob: Uninitialized id returned by saffirepro_both_clk_src_get 2014-10-27 14:09:14 +01:00
bebob_terratec.c Merge branch 'for-linus' into for-next 2014-10-27 14:11:07 +01:00
bebob_yamaha.c ALSA: bebob: More constify text arrays 2014-10-21 08:26:10 +02:00