]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 01:05:02 +0000 (12:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 01:05:02 +0000 (12:05 +1100)
commit14acd138b2833488dabf851fac7738689f4c22ff
treef09516e42cd62c275312d6d3310060ba8af5417a
parent2d9f93e4dbca9ca9a78eaeb84347fda122d9d6ee
parented3825fc46ab971440fddb2180dec061e85b3c78
Merge remote-tracking branch 'v4l-dvb/master'

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