diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-10-16 02:10:32 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-10-16 02:25:28 +0200 |
| commit | 48f87dd146a480c723774962eca675873a8aa1da (patch) | |
| tree | 71461989ebe8a20258ca4b0be341b755594a2b0b /include/uapi | |
| parent | Merge tag 'topic/drm-misc-2015-10-08' of git://anongit.freedesktop.org/drm-in... (diff) | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| download | linux-48f87dd146a480c723774962eca675873a8aa1da.tar.xz linux-48f87dd146a480c723774962eca675873a8aa1da.zip | |
Merge commit '06d1ee32a4d25356a710b49d5e95dbdd68bdf505' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
Backmerge the drm-fixes pull from Linus's tree into drm-next.
This is to fix some conflicts and make future pulls cleaner
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/userfaultfd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h index df0e09bb7dd5..9057d7af3ae1 100644 --- a/include/uapi/linux/userfaultfd.h +++ b/include/uapi/linux/userfaultfd.h @@ -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: |