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)
commit86b5f3ec41b5798811ec488fda4865a9781ec8ef
tree8e9679d8c0c723fdcd6a5a7ace1c4e1a6a1d8a78
parent2a52b6eef7386cc19dfc0a2e82a7e23d807e51e5
parentc078a4aac2944cb9cac5cdb4e9a482623435578b
Merge branch 'topic/line6' into for-next