]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 01:13:42 +0000 (11:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 01:13:42 +0000 (11:13 +1000)
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c

1  2 
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/media/pci/ngene/ngene-cards.c

diff --cc MAINTAINERS
Simple merge
Simple merge