]> 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, 22 Nov 2011 02:44:37 +0000 (13:44 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 02:44:37 +0000 (13:44 +1100)
commit25565b4f4045339b2b485bb49afc37d541926e47
treed6925d414cda0ae9b9c2d636a0a5e7954048ae2d
parentaf74ba4032b26dca5c142096e5b8b9c5c3a3b28f
parenteeff030c47b7e3fcfce1eec2353b696f7db2edfd
Merge remote-tracking branch 'v4l-dvb/master'

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