Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 23 Jan 2013 07:31:34 +0000 (08:31 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 23 Jan 2013 07:31:34 +0000 (08:31 +0100)
This is a preliminary merge before the upcoming merge of generic parser
branch.

1  2 
sound/pci/hda/hda_intel.c
sound/usb/pcm.c

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