]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commite03396ba424ffdac317b20458e2a110576f81c78
tree35ce03c2b9671e463a16f851a40d1b12acef4880
parenta5e5f572755bafe46007fbc8ce1a42a3e8f5d4dc
parent0421fb6ef6581639ede08f20d56a5d6d29d93baf
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/pci/ngene/ngene-cards.c