Merge branch 'fix/oss-header-fix' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 13 Feb 2009 14:05:51 +0000 (15:05 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 13 Feb 2009 14:05:51 +0000 (15:05 +0100)

Trivial merge