]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 00:59:01 +0000 (10:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 21 Sep 2012 00:59:01 +0000 (10:59 +1000)
commitcb560b926f5dc4f65f8b55e5beff8a9e107f2c0e
tree226116af88b9aa6eafd759b2cb054ccf344614a6
parent8b4e2e825905d3cd68adff67793ac12d813538cd
parent624bfccb147bc80b032c697e4c95e7260e02ede9
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/media/pci/ngene/ngene-cards.c
drivers/media/usb/gspca/jl2005bcd.c
drivers/media/usb/gspca/spca506.c
drivers/media/usb/siano/smsusb.c