]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 01:59:29 +0000 (12:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 01:59:29 +0000 (12:59 +1100)
commitab9fef4886b5e846b9adfe6111b9004a75e7fb67
treef0b3be3fbee5340cab1b38ae0ac11eac64ad8cdd
parentfa0ba6ef612123585f06bb1d0efd6ac30ca3492d
parented3825fc46ab971440fddb2180dec061e85b3c78
Merge remote-tracking branch 'v4l-dvb/master'

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