]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:07:14 +0000 (13:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:07:14 +0000 (13:07 +1000)
1  2 
Documentation/DocBook/media/v4l/io.xml
Documentation/feature-removal-schedule.txt
drivers/media/rc/ite-cir.c
drivers/media/video/omap24xxcam.c
drivers/media/video/videobuf2-memops.c
kernel/compat.c

Simple merge
Simple merge
diff --cc kernel/compat.c
Simple merge