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)"

diff --cc drivers/media/rc/mceusb.c
Simple merge

diff --cc drivers/media/rc/nuvoton-cir.c
Simple merge

diff --cc drivers/media/video/cx23885/cx23885-core.c
Simple merge