Merge branch 'for-4.2' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 27 Apr 2015 14:42:45 +0000 (16:42 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 27 Apr 2015 14:42:45 +0000 (16:42 +0200)
commitf1a77547c21fe942e95ebaadbc9200f26d138574
tree3b217b2827e30c840f0747d2cfb861baa656a417
parent30e5f003ff4b2be86f71733b6c9b11355d66584c
parent8ab418d3651b14d38498d868617a7280ccc6de08
Merge branch 'for-4.2' into for-next
sound/pci/emu10k1/emu10k1_main.c
sound/pci/hda/hda_codec.c
sound/pci/hda/hda_intel.c