]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge /home/v4l/v4l/patchwork
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 7 Jul 2012 03:20:07 +0000 (00:20 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 7 Jul 2012 03:20:07 +0000 (00:20 -0300)
* /home/v4l/v4l/patchwork:
  media: Revert "[media] Terratec Cinergy S2 USB HD Rev.2"


Trivial merge