Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorTakashi Iwai <tiwai@suse.de>
Thu, 23 Dec 2010 12:39:59 +0000 (13:39 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 23 Dec 2010 12:39:59 +0000 (13:39 +0100)

Trivial merge