Merge branches 'video' and 'video-edid' into release
[pandora-kernel.git] / sound / soc / soc-core.c
Simple merge