xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'docs-4.10' of git://git.lwn.net/linux into drm-misc-next

Browse Source 
Backmerge the docs-next branch from Jon into drm-misc so that we can
apply the dma-buf documentation cleanup patches. Git found a conflict
where there was none because both drm-misc and docs had identical
patches to clean up file rename issues in the rst include directives.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
This commit is contained in:
Daniel Vetter
2016-12-13 10:36:39 +01:00
parent 38bf57fa7b 868c97a846
commit c248891675
344 changed files with 39950 additions and 21197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/linux/major.h
View File

@@ -3,7 +3,7 @@
/*
* This file has definitions for major device numbers.
* For the device number assignments, see Documentation/devices.txt.
* For the device number assignments, see Documentation/admin-guide/devices.rst.
*/
#define UNNAMED_MAJOR 0