Merge branch 'topic/line6' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 12 Jan 2015 21:33:16 +0000 (22:33 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 12 Jan 2015 21:33:16 +0000 (22:33 +0100)

Trivial merge