tree 2fb8e026712bdf7848ea400e25118f6a58824a02
parent 52a7a5835173af61b9f6c3038212370d9717526f
parent dd3533eca859a6debb1565503ec03e68354e08e0
author Takashi Iwai <tiwai@suse.de> 1263285608 +0100
committer Takashi Iwai <tiwai@suse.de> 1263285608 +0100

Merge commit alsa/devel into topic/misc

Conflicts:
	include/sound/version.h