linux-sg2042/drivers/media/rc
Mauro Carvalho Chehab 64131a87f2 Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
* 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits)
  media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format
  hexdump: avoid warning in test function
  fs: take i_mutex during prepare_binprm for set[ug]id executables
  smp: Fix error case handling in smp_call_function_*()
  iommu-common: Fix PARISC compile-time warnings
  sparc: Make LDC use common iommu poll management functions
  sparc: Make sparc64 use scalable lib/iommu-common.c functions
  Break up monolithic iommu table/lock into finer graularity pools and lock
  sparc: Revert generic IOMMU allocator.
  tools/power turbostat: correct dumped pkg-cstate-limit value
  tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
  tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
  tools/power turbostat: Initial Skylake support
  tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
  tools/power turbostat: modprobe msr, if needed
  tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
  tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
  Bluetooth: hidp: Fix regression with older userspace and flags validation
  config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
  perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()
  ...

That solves several merge conflicts:
	Documentation/DocBook/media/v4l/subdev-formats.xml
	Documentation/devicetree/bindings/vendor-prefixes.txt
	drivers/staging/media/mn88473/mn88473.c
	include/linux/kconfig.h
	include/uapi/linux/media-bus-format.h

The ones at subdev-formats.xml and media-bus-format.h are not trivial.
That's why we opted to merge from DRM.
2015-04-21 09:44:55 -03:00
..
img-ir [media] rc: img-ir: fix error in parameters passed to irq_free() 2015-04-08 12:52:50 -03:00
keymaps media updates for v3.18-rc1 2014-10-10 22:04:49 -04:00
Kconfig [media] media: rc: add driver for Amlogic Meson IR remote receiver 2014-11-26 13:29:01 -02:00
Makefile [media] media: rc: add driver for Amlogic Meson IR remote receiver 2014-11-26 13:29:01 -02:00
ati_remote.c [media] ati_remote: Use non-alomic __set_bit 2014-07-25 23:52:15 -03:00
ene_ir.c PNP: media/rc: Use module_pnp_driver to register driver 2015-03-18 22:39:17 +01:00
ene_ir.h [media] ene_ir: don't use pr_debug after all 2013-07-29 11:49:45 -03:00
fintek-cir.c PNP: media/rc: Use module_pnp_driver to register driver 2015-03-18 22:39:17 +01:00
fintek-cir.h [media] rc: Fir warnings on m68k arch 2013-11-08 09:45:37 -02:00
gpio-ir-recv.c media: rc: drop owner assignment from platform_drivers 2014-10-20 16:20:51 +02:00
igorplugusb.c [media] rc: port IgorPlug-USB to rc-core 2014-11-03 12:18:25 -02:00
iguanair.c [media] rc-core: remove protocol arrays 2014-07-25 19:10:43 -03:00
imon.c [media] imon: fix other RC type protocol support 2014-11-03 10:56:51 -02:00
ir-hix5hd2.c [media] ir-hix5hd2: remove writel/readl_relaxed define 2015-02-11 20:23:52 -02:00
ir-jvc-decoder.c [media] rc-core: remove protocol arrays 2014-07-25 19:10:43 -03:00
ir-lirc-codec.c [media] media/rc: Send sync space information on the lirc device 2014-11-04 20:41:42 -02:00
ir-mce_kbd-decoder.c [media] rc-core: remove protocol arrays 2014-07-25 19:10:43 -03:00
ir-nec-decoder.c [media] rc-core: remove protocol arrays 2014-07-25 19:10:43 -03:00
ir-rc5-decoder.c [media] rc5-decoder: BZ#85721: Fix RC5-SZ decoding 2014-10-30 09:09:28 -02:00
ir-rc6-decoder.c [media] rc-core: fix toggle handling in the rc6 decoder 2014-11-21 15:57:47 -02:00
ir-rx51.c [media] ir-rx51: remove deprecated IRQF_DISABLED 2013-10-17 06:09:02 -03:00
ir-sanyo-decoder.c [media] rc-core: remove protocol arrays 2014-07-25 19:10:43 -03:00
ir-sharp-decoder.c [media] rc-core: remove protocol arrays 2014-07-25 19:10:43 -03:00
ir-sony-decoder.c [media] rc-core: remove protocol arrays 2014-07-25 19:10:43 -03:00
ir-xmp-decoder.c [media] rc: Add support for decoding XMP protocol 2014-07-26 19:38:04 -03:00
ite-cir.c PNP: media/rc: Use module_pnp_driver to register driver 2015-03-18 22:39:17 +01:00
ite-cir.h [media] ite-cir: 8709 needs to use pnp resource 2 2011-07-01 16:31:38 -03:00
lirc_dev.c [media] lirc_dev: avoid potential null-dereference 2015-02-03 17:33:42 -02:00
mceusb.c [media] mceusb: fix usbdev leak 2014-09-23 16:13:38 -03:00
meson-ir.c [media] media: rc: add driver for Amlogic Meson IR remote receiver 2014-11-26 13:29:01 -02:00
nuvoton-cir.c PNP: media/rc: Use module_pnp_driver to register driver 2015-03-18 22:39:17 +01:00
nuvoton-cir.h [media] nuvoton-cir: Don't touch PS/2 interrupts while initializing 2014-02-04 17:47:26 -02:00
rc-core-priv.h [media] rc: Add support for decoding XMP protocol 2014-07-26 19:38:04 -03:00
rc-ir-raw.c [media] rc-core: fix protocol_change regression in ir_raw_event_register 2014-10-30 09:09:28 -02:00
rc-loopback.c [media] rc-core: remove protocol arrays 2014-07-25 19:10:43 -03:00
rc-main.c [media] rc-main: Re-apply filter for no-op protocol change 2014-12-23 16:21:45 -02:00
redrat3.c [media] redrat3: ensure dma is setup properly 2014-12-04 15:28:53 -02:00
st_rc.c [media] st_rc: fix address space casting 2014-09-26 06:47:53 -03:00
streamzap.c [media] rc-core: use USB API functions rather than constants 2014-09-22 17:27:01 -03:00
sunxi-cir.c [media] rc: sunxi-cir: Add support for the larger fifo found on sun5i and sun6i 2015-01-29 18:26:31 -02:00
ttusbir.c [media] rc-core: remove protocol arrays 2014-07-25 19:10:43 -03:00
winbond-cir.c [media] rc-core: remove protocol arrays 2014-07-25 19:10:43 -03:00