]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 00:58:44 +0000 (10:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Sep 2012 00:58:44 +0000 (10:58 +1000)
commit0abb6ba58765fad9f871447e5c78b8b9e6bd99a1
tree003f0655fd45dcb8621ce13ee3bb9ca715466d3d
parent2f2980281141e535076353fb287bc5054f260d24
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