Merge branch 'topic/line6' into for-next

This commit is contained in:
Takashi Iwai 2015-01-12 22:33:16 +01:00
commit 7bfb8575b8
248 changed files with 7701 additions and 6995 deletions