linux/Documentation/devicetree
Dave Airlie 8d4ad9d4bb Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next
Merge drm-fixes into drm-next.

Both i915 and radeon need this done for later patches.

Conflicts:
	drivers/gpu/drm/drm_crtc_helper.c
	drivers/gpu/drm/i915/i915_drv.h
	drivers/gpu/drm/i915/i915_gem.c
	drivers/gpu/drm/i915/i915_gem_execbuffer.c
	drivers/gpu/drm/i915/i915_gem_gtt.c
2014-06-05 20:28:59 +10:00
..
bindings Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next 2014-06-05 20:28:59 +10:00
00-INDEX Documentation/: update 00-INDEX files 2014-02-10 16:01:40 -08:00
booting-without-of.txt dt/bindings: Remove all references to device_type "ethernet-phy" 2014-01-16 11:11:51 +00:00
usage-model.txt doc: device tree: clarify stuff in usage-model.txt. 2013-06-18 13:46:27 +02:00