Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git] / sound / core / pcm_native.c
Simple merge