Merge branch 'topic/snd_card_new-err' into topic/oxygen
authorTakashi Iwai <tiwai@suse.de>
Thu, 19 Feb 2009 09:22:14 +0000 (10:22 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 19 Feb 2009 09:22:14 +0000 (10:22 +0100)
commita5e0e970c06065a14844b406a0c2a59776a1ccc6
tree1da3f4aac02e29f0dfbd099b17412011ca950cb8
parent6ce6c473a7fd742fdb0db95841e2c4c6b37337c5
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45
Merge branch 'topic/snd_card_new-err' into topic/oxygen
drivers/media/video/em28xx/em28xx-audio.c
drivers/media/video/saa7134/saa7134-alsa.c
sound/arm/aaci.c
sound/drivers/mtpav.c
sound/pci/hda/hda_intel.c
sound/pci/intel8x0.c
sound/ppc/snd_ps3.c
sound/soc/soc-core.c
sound/usb/caiaq/caiaq-device.c
sound/usb/usbaudio.c