Merge branch 'topic/oss' into for-linus
[pandora-kernel.git] / sound / soc / codecs / wm8580.c
Simple merge