Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorTakashi Iwai <tiwai@suse.de>
Tue, 10 May 2011 07:24:50 +0000 (09:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 10 May 2011 07:24:50 +0000 (09:24 +0200)

Trivial merge