Merge branch 'topic/oss' into for-linus
[pandora-kernel.git] / sound / core / oss / io.c