Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 8 Apr 2015 09:29:56 +0000 (11:29 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 8 Apr 2015 09:30:49 +0000 (11:30 +0200)
commit0a599838737a2527c35e4d94f794aefe59df1781
treeb1f7571949527c459ca5e27bd420518e905c8b27
parent2d846c74027231264e57e4e34faf9576394e3ce0
parenta59d7199f62b8336570972dcc288321d0ec999fe
Merge branch 'for-linus' into for-next

Back merge HD-audio quirks to for-next branch, so that we can apply
a couple of more quirks.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_realtek.c
sound/usb/quirks.c