Clemens Ladisch 45c1de8e20 ALSA: oxygen: merge HiFier driver into snd-oxygen ... The snd-hifier driver contains more duplicated code than model-specific code, so it does not make sense for it to be a separate driver. Handling the two-channel output restriction can be easily done in the generic driver. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>		2010-11-03 08:19:11 +01:00
..
alsa	ALSA: oxygen: merge HiFier driver into snd-oxygen	2010-11-03 08:19:11 +01:00
oss	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-08-07 17:07:31 -07:00