Merge branch 'topic/line6' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 28 Jan 2015 06:24:41 +0000 (07:24 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 28 Jan 2015 06:24:41 +0000 (07:24 +0100)

Trivial merge