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)
commitebb88024aa1b14a86ecc3a9da013f6713664d94b
tree83bf2de570b16590ea21d0f91b9f23c0c1af40f7
parentd5b562330ec766292a3ac54ae5e0673610bd5b3d
parent43a990765a9e874350bae1009366d00809dbc9d8
Merge branch 'fix/oss-header-fix' into for-linus