Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...
Takashi Iwai [Tue, 5 Jul 2011 06:20:19 +0000 (08:20 +0200)]

Trivial merge