Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
authorTakashi Iwai <tiwai@suse.de>
Mon, 16 Feb 2009 22:03:57 +0000 (23:03 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 16 Feb 2009 22:03:57 +0000 (23:03 +0100)
commit96cf45cf559be375de29dd45afc50fa8946fb2aa
tree06242d4256aadc01aee67dfafbb94541e7a17738
parent4c9f1d3ed7e5f910b66dc4d1456cfac17e58cf0e
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45
Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
12 files changed:
sound/isa/ad1816a/ad1816a.c
sound/isa/cmi8330.c
sound/isa/es1688/es1688.c
sound/isa/gus/interwave.c
sound/isa/opl3sa2.c
sound/isa/opti9xx/opti92x-ad1848.c
sound/isa/sc6000.c
sound/isa/wavefront/wavefront.c
sound/pci/hda/hda_intel.c
sound/ppc/snd_ps3.c
sound/soc/soc-core.c
sound/usb/caiaq/caiaq-device.c