Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 21 Dec 2009 11:06:28 +0000 (12:06 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 21 Dec 2009 11:06:28 +0000 (12:06 +0100)

Trivial merge