Commit a29fb94f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge commit alsa/devel into topic/misc

Conflicts:
	include/sound/version.h
parents 52a7a583 dd3533ec
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment