Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 3 Dec 2015 16:36:02 +0000 (17:36 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 3 Dec 2015 16:36:02 +0000 (17:36 +0100)
commita72f65954926fbcbf6abe3054f6694915c809eb3
tree4945f950af978912ded5d61d45b1c4ef3da85ebe
parentb03d61d646c596efd02db64df43d287ea596b663
parentbcdda2ec28c31fe62d5d85c8b603f202a2c85fac
Merge branch 'for-linus' into for-next
sound/pci/hda/patch_conexant.c