Merge branch 'topic/snd_card_new-err' into topic/atmel
authorTakashi Iwai <tiwai@suse.de>
Thu, 5 Feb 2009 14:08:33 +0000 (15:08 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 5 Feb 2009 14:08:33 +0000 (15:08 +0100)
commit6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7
tree2d6a9fdb99ddd1fb61fac029a4e04ac96e12c179
parent18e352e4a73465349711a9324767e1b2453383e2
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45
Merge branch 'topic/snd_card_new-err' into topic/atmel
sound/pci/hda/hda_intel.c
sound/ppc/snd_ps3.c
sound/soc/soc-core.c
sound/usb/caiaq/caiaq-device.c