Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork: (155 commits)
  [media] stv090x: add support for multistream
  [media] DocBook: Multistream support
  [media] dvb_frontend: add multistream support
  [media] ce6230: use Kernel dev_foo() logging
  [media] ec168: use Kernel dev_foo() logging
  [media] gl861: use Kernel dev_foo() logging
  [media] au6610: use Kernel dev_foo() logging
  [media] af9035: use Kernel dev_foo() logging
  [media] af9015: correct few error codes
  [media] af9015: improve af9015_eeprom_hash()
  [media] af9015: use Kernel dev_foo() logging
  [media] rtl2830: declare two tables as constant
  [media] rtl2830: use .get_if_frequency()
  [media] rtl2830: use Kernel dev_foo() logging
  [media] hd29l2: use Kernel dev_foo() logging
  [media] ec100: improve I2C routines
  [media] ec100: use Kernel dev_foo() logging
  [media] af9013: use Kernel dev_foo() logging
  [media] af9033: use Kernel dev_foo() logging
  [media] ec168: declare MODULE_FIRMWARE
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/i2c/m5mols/m5mols_core.c
index 8bf6599a4c1aaa1ff2054115dd13d6bcdb31aa1d,0f521f57e8e5b8864bbce00344379de768c3989d..6ca6a7f9de1532f9ae404e7c83f9a43aa01704c7
--- 1/drivers/media/i2c/m5mols/m5mols_core.c
--- 2/drivers/media/i2c/m5mols/m5mols_core.c
+++ b/drivers/media/i2c/m5mols/m5mols_core.c
@@@ -937,11 -937,9 +937,11 @@@ static int __devinit m5mols_probe(struc
        if (!ret)
                ret = m5mols_init_controls(sd);
  
-       m5mols_sensor_power(info, false);
+       ret = m5mols_sensor_power(info, false);
        if (!ret)
                return 0;
 +out_irq:
 +      free_irq(client->irq, sd);
  out_me:
        media_entity_cleanup(&sd->entity);
  out_reg:

diff --cc drivers/media/platform/s5p-fimc/fimc-m2m.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-ioctl.c
Simple merge