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
..
b2c2	[media] pci: flexcop: Remove redundant pci_set_drvdata	2013-10-17 05:56:55 -03:00
bt8xx	Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus	2015-04-21 09:44:55 -03:00
cx18	[media] cx18: replace cropping ioctls by selection ioctls	2015-04-08 06:42:41 -03:00
cx88	[media] cx88: embed video_device	2015-04-08 06:43:16 -03:00
cx23885	Merge branch 'patchwork' into v4l_for_linus	2015-04-21 06:12:35 -03:00
cx25821	[media] cx25821: remove video output support	2014-12-23 10:22:00 -02:00
ddbridge	[media] ddbridge: remove unneeded check before dvb_unregister_device()	2014-12-04 15:28:52 -02:00
dm1105	[media] dm1105: fix sparse warning	2014-09-03 10:32:59 -03:00
ivtv	[media] ivtv: disable fbuf support if ivtvfb isn't loaded	2015-04-02 23:57:51 -03:00
mantis	[media] media: pci: mantis: mantis_core.c: Remove unused function	2015-01-27 10:10:06 -02:00
meye	[media] meye: embed video_device	2015-04-02 23:35:01 -03:00
ngene	[media] ngene: properly handle __user ptr	2014-09-08 10:00:52 -03:00
pluto2	[media] media_tree: Fix spelling errors	2013-12-09 14:50:50 -02:00
pt1	[media] media: earthsoft: logging neatening	2014-11-03 11:00:41 -02:00
pt3	[media] media: earthsoft: logging neatening	2014-11-03 11:00:41 -02:00
saa7134	[media] media: pci: saa7134: saa7134-video.c: Remove unused function	2015-01-27 10:10:23 -02:00
saa7146	[media] saa7146: embed video_device	2015-04-02 23:29:01 -03:00
saa7164	[media] saa7164: free_irq before pci_disable_device	2015-03-03 11:16:09 -03:00
smipcie	[media] smipcie: switch ts2022 to ts2020 driver	2015-04-02 22:25:14 -03:00
solo6x10	[media] solo6x10: s/uint8_t/u8/	2015-01-27 10:03:19 -02:00
sta2x11	[media] sta2x11: embed video_device	2015-04-02 23:56:44 -03:00
ttpci	[media] saa7146: embed video_device	2015-04-02 23:29:01 -03:00
tw68	[media] tw68: remove unnecessary version.h inclusion	2015-01-27 10:08:49 -02:00
zoran	media updates for v3.19-rc1	2014-12-11 11:49:23 -08:00
Kconfig	[media] smipcie: SMI pcie bridge driver for DVBSky S950 V3 dvb-s/s2 cards	2014-11-03 18:06:45 -02:00
Makefile	[media] smipcie: SMI pcie bridge driver for DVBSky S950 V3 dvb-s/s2 cards	2014-11-03 18:06:45 -02:00