Merge branch 'devel' of git.alsa-project.org:alsa-kernel into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Tue, 27 Jul 2010 08:16:04 +0000 (10:16 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 27 Jul 2010 08:16:04 +0000 (10:16 +0200)

Trivial merge