Merge branch 'topic/line6' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 30 Jan 2015 11:15:55 +0000 (12:15 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 30 Jan 2015 11:15:55 +0000 (12:15 +0100)

Trivial merge