Merge branch 'master' of git.alsa-project.org:alsa-kernel into fix/hda
authorTakashi Iwai <tiwai@suse.de>
Wed, 2 Jun 2010 12:15:10 +0000 (14:15 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 2 Jun 2010 12:15:10 +0000 (14:15 +0200)

Trivial merge