tree 1c990d9f2f91f6daabbf2de957bea744dd2bcb71
parent 4c5ecb7e59662a76754efdd41c6ed4415e6e9840
parent e5bf48437370f3fc603e2dce12e8d3fb1a6a2457
author Takashi Iwai <tiwai@suse.de> 1237851376 +0100
committer Takashi Iwai <tiwai@suse.de> 1237851376 +0100

Merge branch 'topic/oss-fix' into for-linus