Mark Brown 0b34a3d03e ASoC: Ease merge difficulties from new architectures ... Rather than listing lots of architectures per line in Kconfig and Makefile, causing merge conflicts all the time, have one per line in alphabetical order. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>		2008-12-18 17:21:01 +00:00
..
aoa	Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus	2008-11-03 16:28:24 +01:00
arm	Merge branches 'topic/asoc', 'topic/misc-fixes' and 'topic/hda' into for-linus	2008-10-23 19:20:54 +02:00
core	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2008-11-03 10:14:59 -08:00
drivers	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2008-11-03 10:14:59 -08:00
i2c	V4L/DVB (8788): v4l: replace video_get_drvdata(video_devdata(filp)) with video_drvdata(filp)	2008-10-12 09:36:54 -02:00
isa	ALSA: gusextreme: Fix build errors	2008-11-10 07:54:25 +01:00
mips	removed unused #include <linux/version.h>'s	2008-08-23 12:14:12 -07:00
oss	oss: fix O_NONBLOCK in dmasound_core	2008-11-01 12:40:38 -07:00
parisc	ALSA: harmony - fix a typo	2008-09-04 10:33:55 +02:00
pci	Merge branch 'topic/fix/hda' into for-linus	2008-11-25 17:21:32 +01:00
pcmcia	ALSA: Kill snd_assert() in other places	2008-08-13 11:46:40 +02:00
ppc	ALSA: ps3: Add support for SPDIF/HDMI passthru	2008-10-20 08:06:39 +02:00
sh	ALSA: Fix section for snd-aica platform driver	2008-09-23 08:17:58 +02:00
soc	ASoC: Ease merge difficulties from new architectures	2008-12-18 17:21:01 +00:00
sparc	Revert "of_platform_driver noise on sparce"	2008-12-01 07:55:14 -08:00
spi
synth	ALSA: Kill snd_assert() in other places	2008-08-13 11:46:40 +02:00
usb	ALSA: usb - Add quirk for Edirol UA-25EX advanced modes	2008-10-30 11:37:01 +01:00
ac97_bus.c
Kconfig	Fix CONFIG_AC97_BUS dependency	2008-09-06 11:43:41 +02:00
last.c
Makefile
sound_core.c	sound/sound_core: Fix sparse warnings	2008-11-21 08:13:15 +01:00
sound_firmware.c