tree 29ff039af456f0aed5280943bc9e1593893b5b21
parent 1001fb810b1295d0600c0c6bdcb17889460470a5
parent 247d95ee6dd22e5323ecf7a73ff64110ef2fa2da
author Takashi Iwai <tiwai@suse.de> 1422426281 +0100
committer Takashi Iwai <tiwai@suse.de> 1422426281 +0100

Merge branch 'topic/line6' into for-next