Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 28 Nov 2013 10:43:30 +0000 (11:43 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 28 Nov 2013 10:43:30 +0000 (11:43 +0100)
1  2 
sound/pci/hda/hda_generic.c

Simple merge