openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/Documentation/devicetree
History
Dave Airlie 281d1bbd34 Merge remote-tracking branch 'origin/master' into drm-next 
Backmerge Linus tree after rc5 + drm-fixes went in.

There were a few amdkfd conflicts I wanted to avoid,
and Ben requested this for nouveau also.

Conflicts:
	drivers/gpu/drm/amd/amdkfd/Makefile
	drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
	drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
	drivers/gpu/drm/amd/amdkfd/kfd_priv.h
	drivers/gpu/drm/amd/include/kgd_kfd_interface.h
	drivers/gpu/drm/i915/intel_runtime_pm.c
	drivers/gpu/drm/radeon/radeon_kfd.c
 		2015-01-22 10:44:41 +10:00
..
bindings Merge remote-tracking branch 'origin/master' into drm-next 2015-01-22 10:44:41 +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
…