Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...
authorTakashi Iwai <tiwai@suse.de>
Sat, 9 Jul 2011 09:43:04 +0000 (11:43 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 9 Jul 2011 09:43:04 +0000 (11:43 +0200)

Trivial merge