Merge 4.3-rc4 into char-misc-next

This is needed due to the duplicated iommu stuff to help with the merge and to prevent future issues.

Greg Kroah-Hartman committed 11 years ago

Commit c39b7ee2 parents 1e1851f 049e6dd285 files · +2457 −1583Browse files

Showing the changes to include/uapi (1 of 285 files). Show all

Unified · Split

@@ -11,8 +11,6 @@ · 10 unmodified lines
11	11
12	12	#include <linux/types.h>
13	13
14		−#include <linux/compiler.h>
15		−
16	14	#define UFFD_API ((__u64)0xAA)
17	15	/*
18	16	* After implementing the respective features it will become:

Keyboard shortcuts