Merge branch 'topic/oss-removal' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 20 May 2011 09:34:02 +0000 (11:34 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 20 May 2011 09:34:02 +0000 (11:34 +0200)

Trivial merge