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)
Conflicts:
sound/soc/soc-core.c


Trivial merge