Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
Takashi Iwai [Wed, 30 Mar 2011 06:35:18 +0000 (08:35 +0200)]

Trivial merge