Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 5 Feb 2010 19:00:55 +0000 (20:00 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 5 Feb 2010 19:00:55 +0000 (20:00 +0100)

Trivial merge