]> 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, 6 Sep 2012 02:11:41 +0000 (12:11 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Sep 2012 02:11:41 +0000 (12:11 +1000)
commit33c6247c4b6e6c1fabe79bf64ef430e76e93796b
tree114ab9334a569ff7b7745b164796a61059c46b89
parentbab08cb5a97c88923d43b257424c2c97a7cea0fc
parent624bfccb147bc80b032c697e4c95e7260e02ede9
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
MAINTAINERS
drivers/media/usb/gspca/jl2005bcd.c
drivers/media/usb/gspca/spca506.c
drivers/media/usb/siano/smsusb.c