Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 4 Apr 2016 09:51:08 +0000 (11:51 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 4 Apr 2016 09:51:08 +0000 (11:51 +0200)
commita99e31512aa435e8391ba5f5e64abeac9c5f2f32
tree56bb9d9ccfe76520b672249757e25f686275b204
parent86c8dd7f4da3fb3f92fc5ab5144c971639d39745
parentf03b24a851d32ca85dacab01785b24a7ee717d37
Merge branch 'for-linus' into for-next

Conflicts:
sound/hda/hdac_i915.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/hda/hdac_i915.c