Merge branch 'topic/line6' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 30 Jan 2015 11:15:55 +0000 (12:15 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 30 Jan 2015 11:15:55 +0000 (12:15 +0100)
commit6eb3db91f2b68cbbcc1b4256333dc683afb54a73
tree0b8fec47c5f66b1bd54e7e15de618698d69123af
parentd832f3dcb6e2d153fbb69b91931058d138bc41cb
parent1263f61179821df60cca4bccdb69e2f71fdebaa7
Merge branch 'topic/line6' into for-next