]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 01:41:01 +0000 (11:41 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 10 Sep 2012 01:41:01 +0000 (11:41 +1000)
commit873ca0a586aa0b74e4a59309ba95af6132de010e
treea4c36def5aa07274e6641da1e1509d7f5de9ec15
parent834324c8b2bd3ad657f1e29ef1c4fe28c4227468
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