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
..
media	Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus	2015-04-21 09:44:55 -03:00
.gitignore
80211.tmpl	wireless: docs: fix 'make pdfdocs' failure	2015-01-28 08:53:58 +01:00
alsa-driver-api.tmpl
crypto-API.tmpl	crypto: doc - AEAD / RNG AF_ALG interface	2015-03-09 21:06:18 +11:00
debugobjects.tmpl
device-drivers.tmpl	Fix docs build failure caused by i2o removal	2015-02-16 12:52:08 -07:00
deviceiobook.tmpl
drm.tmpl	Merge Linus master into drm-next	2015-04-20 13:05:20 +10:00
filesystems.tmpl
gadget.tmpl
genericirq.tmpl
kernel-api.tmpl
kernel-hacking.tmpl
kernel-locking.tmpl
kgdb.tmpl	KGDB/KDB New:	2015-02-20 15:13:29 -08:00
libata.tmpl
librs.tmpl
lsm.tmpl
Makefile	DocBook: Do not exceed argument list limit	2015-01-28 11:33:44 -07:00
media_api.tmpl
mtdnand.tmpl
networking.tmpl
rapidio.tmpl
regulator.tmpl
s390-drivers.tmpl
scsi.tmpl
sh.tmpl
stylesheet.xsl
tracepoint.tmpl
uio-howto.tmpl	pdfdocs: Fix 'make pdfdocs' failure for 'uio-howto.tmpl'	2015-02-03 15:48:51 -08:00
usb.tmpl
w1.tmpl
writing_musb_glue_layer.tmpl
writing_usb_driver.tmpl
writing-an-alsa-driver.tmpl
z8530book.tmpl