Merge branch 'topic/line6' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 20 Jan 2015 09:08:06 +0000 (10:08 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 20 Jan 2015 09:08:06 +0000 (10:08 +0100)

Trivial merge