History

Merge 4.0-rc7 into tty-next

We want the fixes in here as well, also to help out with merge issues.

Greg Kroah-Hartman committed 11 years ago

Commit b3e3bf22 parents fbf4763 f22e6e8305 files · +2832 −1381Browse files

Showing the changes to include/uapi (2 of 305 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/input.h +2 −1
  2. include/uapi/linux/nfsd/export.h +1 −1
include/uapi/linux/input.h+2−1
@@ -973,7 +973,8 @@ struct input_keymap_entry { · 972 unmodified lines
973 */973 */
974#define MT_TOOL_FINGER 0974#define MT_TOOL_FINGER 0
975#define MT_TOOL_PEN 1975#define MT_TOOL_PEN 1
976#define MT_TOOL_MAX 1976#define MT_TOOL_PALM 2
977#define MT_TOOL_MAX 2
977 978
978/*979/*
979 * Values describing the status of a force-feedback effect980 * Values describing the status of a force-feedback effect
include/uapi/linux/nfsd/export.h+1−1
@@ -47,7 +47,7 @@ · 46 unmodified lines
47 * exported filesystem.47 * exported filesystem.
48 */48 */
49#define NFSEXP_V4ROOT 0x1000049#define NFSEXP_V4ROOT 0x10000
50#define NFSEXP_NOPNFS 0x2000050#define NFSEXP_PNFS 0x20000
51 51
52/* All flags that we claim to support. (Note we don't support NOACL.) */52/* All flags that we claim to support. (Note we don't support NOACL.) */
53#define NFSEXP_ALLFLAGS 0x3FE7F53#define NFSEXP_ALLFLAGS 0x3FE7F