Merge tag 'v4.0-rc7' into next

Sync up with Linux 4.0-rc7 to bring in ALPS changes.
2015-04-07 08:46:23 -07:00
parent b6d2d3289f f22e6e8471
commit 5f63e885ac
305 changed files with 2834 additions and 1383 deletions
@@ -974,7 +974,8 @@ struct input_keymap_entry {
 */
 #define MT_TOOL_FINGER		0
 #define MT_TOOL_PEN		1
-#define MT_TOOL_MAX		1
+#define MT_TOOL_PALM		2
+#define MT_TOOL_MAX		2

 /*
 * Values describing the status of a force-feedback effect
@@ -47,7 +47,7 @@
 * exported filesystem.
 */
 #define	NFSEXP_V4ROOT		0x10000
-#define NFSEXP_NOPNFS		0x20000
+#define NFSEXP_PNFS		0x20000

 /* All flags that we claim to support.  (Note we don't support NOACL.) */
 #define NFSEXP_ALLFLAGS		0x3FE7F