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	doc: Add "*.svg" to DocBook/.gitignore	2013-12-02 14:49:19 +01:00
80211.tmpl	wireless: docs: fix 'make pdfdocs' failure	2015-01-28 08:53:58 +01:00
alsa-driver-api.tmpl	ALSA: doc: Fix missing "I" for kerneldoc inclusion	2014-10-30 15:42:33 +01:00
crypto-API.tmpl	crypto: doc - AEAD / RNG AF_ALG interface	2015-03-09 21:06:18 +11:00
debugobjects.tmpl	debugobjects: Extend to assert that an object is initialized	2011-11-23 18:49:22 +01:00
device-drivers.tmpl	Fix docs build failure caused by i2o removal	2015-02-16 12:52:08 -07:00
deviceiobook.tmpl	docbook: change iomap source filename in deviceiobook	2012-01-23 08:44:54 -08:00
drm.tmpl	Merge Linus master into drm-next	2015-04-20 13:05:20 +10:00
filesystems.tmpl	htmldocs: fix bio.c location	2014-05-20 08:17:35 -06:00
gadget.tmpl	usb: patches for v3.17 merge window	2014-07-21 11:33:41 -07:00
genericirq.tmpl	DocBook: fix various typos	2014-07-12 11:30:36 -07:00
kernel-api.tmpl	DocBook: include !Emm/util.c in kernel-api to include, kzfree and more	2013-12-02 14:42:57 +01:00
kernel-hacking.tmpl	Merge branch 'akpm' (incoming from Andrew)	2014-04-07 16:38:06 -07:00
kernel-locking.tmpl	locking/Documentation: Move locking related docs into Documentation/locking/	2014-08-13 10:32:03 +02:00
kgdb.tmpl	KGDB/KDB New:	2015-02-20 15:13:29 -08:00
libata.tmpl	DocBook: fix various typos	2014-07-12 11:30:36 -07:00
librs.tmpl
lsm.tmpl
Makefile	DocBook: Do not exceed argument list limit	2015-01-28 11:33:44 -07:00
media_api.tmpl	DocBook: fix various typos	2014-07-12 11:30:36 -07:00
mtdnand.tmpl	DocBook: fix mtdnand typos	2014-07-12 11:30:36 -07:00
networking.tmpl	docbook: networking: fix file paths for uapi headers	2012-10-15 08:04:41 -07:00
rapidio.tmpl	docbook: fix rapidio warning	2011-03-27 19:30:19 -07:00
regulator.tmpl	DocBook: fix various typos	2014-07-12 11:30:36 -07:00
s390-drivers.tmpl
scsi.tmpl
sh.tmpl	sh: clkfwk: Kill off unused clk_set_rate_ex().	2010-11-15 18:25:12 +09:00
stylesheet.xsl
tracepoint.tmpl	workqueue: Add a workqueue chapter to the tracepoint docbook	2010-08-27 12:27:36 +02:00
uio-howto.tmpl	pdfdocs: Fix 'make pdfdocs' failure for 'uio-howto.tmpl'	2015-02-03 15:48:51 -08:00
usb.tmpl	usb: hub: rename khubd to hub_wq in documentation and comments	2014-09-23 22:33:19 -07:00
w1.tmpl	w1: format for DocBook and fixes	2014-02-07 15:40:18 -08:00
writing_musb_glue_layer.tmpl	documentation: docbook: document process of writing an musb glue layer	2014-05-12 12:34:47 -05:00
writing_usb_driver.tmpl	doc: fix misspellings with 'codespell' tool	2013-05-28 12:02:12 +02:00
writing-an-alsa-driver.tmpl	ALSA: doc: Recommend the use of snd_ctl_elem_info()	2014-10-20 18:06:04 +02:00
z8530book.tmpl