Merge commit alsa/devel into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Tue, 12 Jan 2010 08:40:08 +0000 (09:40 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 12 Jan 2010 08:40:08 +0000 (09:40 +0100)
Conflicts:
include/sound/version.h


Trivial merge