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)
commite152f18027552eb34006b35347e72bc805783027
treeac9765e68597c08c24de447f46bb3e04d9881e1b
parent49ba4f94bddb7f5272c4596d505f94355cc3fbd2
parent42c364ace52ae6b4699105b39f2559c256b6cd4c
Merge branch 'for-linus' into for-next

This is a preliminary merge before the upcoming merge of generic parser
branch.
sound/pci/hda/hda_intel.c
sound/usb/pcm.c