]> 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, 7 Dec 2011 00:54:42 +0000 (11:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 00:54:42 +0000 (11:54 +1100)
commit8eabb1c9016cc7ea3bd0349ce3d9583f6c7c9d07
treeacabba4d9f4af796a1d62f785bb1841eef5ce6c4
parentac67f66c62d19fe02f66c4d32aeac0f969ddf597
parented3825fc46ab971440fddb2180dec061e85b3c78
Merge remote-tracking branch 'v4l-dvb/master'

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