dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '06d1ee32a4d25356a710b49d5e95dbdd68bdf505' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next

Browse Source 
Backmerge the drm-fixes pull from Linus's tree into drm-next.

This is to fix some conflicts and make future pulls cleaner
This commit is contained in:
Dave Airlie
2015-10-16 10:25:28 +10:00
parent 6b62b3e134 06d1ee32a4
commit 48f87dd146
445 changed files with 3441 additions and 2101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/uapi/linux/userfaultfd.h
-2
View File
@@ -11,8 +11,6 @@
#include <linux/types.h>
#include <linux/compiler.h>
#define UFFD_API ((__u64)0xAA)
/*
* After implementing the respective features it will become: