Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 8 Nov 2012 14:58:25 +0000 (15:58 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 8 Nov 2012 14:58:25 +0000 (15:58 +0100)
1  2 
sound/core/pcm_native.c
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_cirrus.c
sound/pci/hda/patch_realtek.c
sound/pci/ice1712/ice1724.c
sound/usb/pcm.c

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