]> 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, 30 Nov 2011 01:40:15 +0000 (12:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 01:40:15 +0000 (12:40 +1100)
commit98ad8605251a66dca07fde4ddab3ac90f0c9df14
tree1f9c69435a2badc71d5e347f5fa0615033cc2d54
parentcc8e3685004e5f8d1697c858f5614281d77795ea
parented3825fc46ab971440fddb2180dec061e85b3c78
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
drivers/staging/media/as102/as102_drv.h
MAINTAINERS