]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge /home/v4l/v4l/for_upstream
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 11 Jul 2011 23:54:42 +0000 (20:54 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 11 Jul 2011 23:54:42 +0000 (20:54 -0300)
commit93a2bed5754fd8f3141ad29ead1e451fb7338bf5
tree0950c31b509f4a298df01a15f3b4290eb09cae59
parent2d3c65f11898a1fae23fd2bcfa8340e2a9ba306f
parentd7b290a1056c5564eec8a1b169c6e84ff3f54c13
Merge /home/v4l/v4l/for_upstream

* /home/v4l/v4l/for_upstream:
  [media] nuvoton-cir: make idle timeout more sane
  [media] mceusb: increase default timeout to 100ms
  [media] mceusb: Timeout unit corrections
  [media] Revert "V4L/DVB: cx23885: Enable Message Signaled Interrupts(MSI)"
drivers/media/rc/mceusb.c
drivers/media/rc/nuvoton-cir.c
drivers/media/video/cx23885/cx23885-core.c