Merge branch 'devel' of git.alsa-project.org:alsa-kernel into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Mon, 19 Jul 2010 15:42:09 +0000 (17:42 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 19 Jul 2010 15:42:09 +0000 (17:42 +0200)

Trivial merge