Merge branch 'topic/hdmi-jack' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 21 Dec 2015 10:46:30 +0000 (11:46 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 21 Dec 2015 10:46:30 +0000 (11:46 +0100)

Trivial merge