OpenCloudOS-Kernel/Documentation/devicetree
Dave Airlie b3869b17fd Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
This backmerges drm-fixes into drm-next mainly for the amdkfd
stuff, I'm not 100% confident, but it builds and the amdkfd
folks can fix anything up.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
	drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
2015-01-29 11:45:31 +10:00
..
bindings Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next 2015-01-29 11:45:31 +10:00
00-INDEX
booting-without-of.txt dt/documentation: add specification of dma bus information 2014-09-26 11:18:05 -05:00
changesets.txt of: Transactional DT support. 2014-07-23 17:29:15 -06:00
dynamic-resolution-notes.txt of: Introduce Device Tree resolve support. 2014-10-04 21:24:26 +01:00
of_selftest.txt of: Eliminate of_allnodes list 2014-11-04 13:29:38 +00:00
overlay-notes.txt of/overlay: Introduce DT overlay support 2014-11-24 22:25:10 +00:00
todo.txt of: Eliminate of_allnodes list 2014-11-04 13:29:38 +00:00
usage-model.txt