Merge commit 'v2.6.38-rc2' into topic/misc
authorTakashi Iwai <tiwai@suse.de>
Mon, 24 Jan 2011 17:41:10 +0000 (18:41 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 24 Jan 2011 17:41:10 +0000 (18:41 +0100)

Trivial merge