Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git] / drivers / media / dvb / dvb-usb / dw2102.c
Simple merge