]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 01:57:26 +0000 (11:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 01:57:26 +0000 (11:57 +1000)
commit12ac35c713ea9d87ff3ec80e0d26d382ae74da11
tree7817256d6bb15e2b2c6466b7ffceb87567049ee2
parent1d6dc2204296e98714c48127c3a28b53e99031da
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/usb/gspca/jl2005bcd.c
drivers/media/usb/gspca/spca506.c
drivers/media/usb/siano/smsusb.c