]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 02:04:07 +0000 (13:04 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 02:04:07 +0000 (13:04 +1100)
commitf13d24502922dec227156b4a6be3c6360f423cdd
tree9c9a4c96c77ad1149a4b8eb6f2c20d7b7b63aa9d
parentc5609ee2568fa84ead120cad859721f5fec2b220
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