]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 01:37:40 +0000 (11:37 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 20 Sep 2012 01:37:40 +0000 (11:37 +1000)
commit19a3244f07edb5ae0fe0ed6771280d2b38ea1678
treed16544b452d4e68bdf76a013b4b3b33099608d1d
parent5df447343165cc2364f83963ea48bf190fe0de28
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