Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorTakashi Iwai <tiwai@suse.de>
Wed, 12 Jan 2011 11:26:24 +0000 (12:26 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 12 Jan 2011 11:26:24 +0000 (12:26 +0100)

Trivial merge