Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorTakashi Iwai <tiwai@suse.de>
Mon, 28 Mar 2011 11:02:29 +0000 (13:02 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 28 Mar 2011 11:02:29 +0000 (13:02 +0200)

Trivial merge