1
0
Fork 0
alistair23-linux/drivers/media/common
Mauro Carvalho Chehab a66d05d504 Merge branch 'patchwork' into v4l_for_linus
* patchwork: (544 commits)
  [media] ir-hix5hd2: fix build on c6x arch
  [media] pt3: fix DTV FE I2C driver load error paths
  Revert "[media] media: em28xx - remove reset_resume interface"
  [media] exynos4-is: fix some warnings when compiling on arm64
  [media] usb drivers: use %zu instead of %zd
  [media] pci drivers: use %zu instead of %zd
  [media] dvb-frontends: use %zu instead of %zd
  [media] s5p-mfc: Fix several printk warnings
  [media] s5p_mfc_opr: Fix warnings
  [media] ti-vpe: Fix typecast
  [media] s3c-camif: fix dma_addr_t printks
  [media] s5p_mfc_opr_v6: get rid of warnings when compiled with 64 bits
  [media] s5p_mfc_opr_v5: Fix lots of warnings on x86_64
  [media] em28xx: Fix identation
  [media] drxd: remove a dead code
  [media] saa7146: remove return after BUG()
  [media] cx88: remove return after BUG()
  [media] cx88: fix cards table CodingStyle
  [media] radio-sf16fmr2: declare some structs as static
  [media] radio-sf16fmi: declare pnp_attached as static
  ...

Conflicts:
	Documentation/DocBook/media/v4l/compat.xml
2014-10-09 14:00:54 -03:00
..
b2c2 [media] drivers: media: b2c2: flexcop.h: Fix typo in include guard 2014-09-21 20:11:54 -03:00
saa7146 [media] saa7146: remove return after BUG() 2014-09-26 06:47:57 -03:00
siano [media] siano: just return 0 instead of using a var 2014-09-03 17:59:27 -03:00
Kconfig [media] media: Fix randconfig error 2013-04-14 20:04:08 -03:00
Makefile [media] media: move dvb-usb-v2/cypress_firmware.c to media/common 2013-03-29 11:35:06 -03:00
btcx-risc.c [media] btcx-risc: move from media/i2c to media/common 2013-02-08 16:11:25 -02:00
btcx-risc.h [media] btcx-risc: move from media/i2c to media/common 2013-02-08 16:11:25 -02:00
cx2341x.c [media] cx2341x: fix kernel oops 2014-09-21 20:56:11 -03:00
cypress_firmware.c [media] media: move dvb-usb-v2/cypress_firmware.c to media/common 2013-03-29 11:35:06 -03:00
cypress_firmware.h [media] media: move dvb-usb-v2/cypress_firmware.c to media/common 2013-03-29 11:35:06 -03:00
tveeprom.c [media] tveeprom: remove v4l2-chip-ident.h include 2013-06-17 08:48:03 -03:00