Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
	arch/arm/mach-imx/mach-imx27_visstrim_m10.c

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/usb/gspca/jl2005bcd.c
Simple merge

diff --cc drivers/media/usb/gspca/spca506.c
Simple merge

diff --cc drivers/media/usb/siano/smsusb.c
Simple merge