Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorTakashi Iwai <tiwai@suse.de>
Tue, 12 May 2009 10:32:07 +0000 (12:32 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 12 May 2009 10:32:07 +0000 (12:32 +0200)

Trivial merge