Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 30 Oct 2012 10:08:25 +0000 (11:08 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 30 Oct 2012 10:08:25 +0000 (11:08 +0100)
... for migrating the core changes for USB-audio disconnection fixes

1  2 
sound/core/pcm_native.c
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_realtek.c
sound/pci/hda/patch_sigmatel.c
sound/usb/pcm.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc sound/usb/pcm.c
Simple merge