Merge branch 'topic/line6' into for-next

This commit is contained in:
Takashi Iwai 2015-01-20 10:08:06 +01:00
commit 86b5f3ec41
26 changed files with 946 additions and 1428 deletions