Merge commit alsa/devel into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Tue, 12 Jan 2010 08:40:08 +0000 (09:40 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 12 Jan 2010 08:40:08 +0000 (09:40 +0100)
commita29fb94ff48cba620e1ac1317f5eef5920ead3ff
tree2fb8e026712bdf7848ea400e25118f6a58824a02
parent52a7a5835173af61b9f6c3038212370d9717526f
parentdd3533eca859a6debb1565503ec03e68354e08e0
Merge commit alsa/devel into topic/misc

Conflicts:
include/sound/version.h
include/sound/pcm.h
sound/core/pcm_lib.c
sound/core/pcm_native.c
sound/pci/hda/hda_codec.c
sound/pci/hda/patch_analog.c
sound/pci/hda/patch_cirrus.c
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c