Merge branch 'topic/snd_card_new-err' into topic/asoc
authorTakashi Iwai <tiwai@suse.de>
Wed, 28 Jan 2009 07:08:32 +0000 (08:08 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 28 Jan 2009 07:08:32 +0000 (08:08 +0100)
commit67fcdead3c7424d51e7108c220c9ab1a5e752ed3
tree3c48fabced8e519ef3f83209a793dfea48dbbfa8
parent006f367e38fb45e2f161c0f500c74449ae63e866
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45
Merge branch 'topic/snd_card_new-err' into topic/asoc

Conflicts:
sound/soc/soc-core.c
sound/pci/hda/hda_intel.c
sound/soc/soc-core.c
sound/usb/caiaq/caiaq-device.c