Merge branch 'master' into upstream

Conflicts: drivers/hid/hid-ids.h
2010-02-02 23:10:39 +01:00
parent 8127f4e883 1a45dcfe25
commit e1a0bdd802
5918 changed files with 487587 additions and 284981 deletions
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -702,6 +702,7 @@ struct input_absinfo {
 #define ABS_MT_TOOL_TYPE	0x37	/* Type of touching device */
 #define ABS_MT_BLOB_ID		0x38	/* Group a set of packets as a blob */
 #define ABS_MT_TRACKING_ID	0x39	/* Unique ID of initiated contact */
+#define ABS_MT_PRESSURE		0x3a	/* Pressure on contact area */

 #define ABS_MAX			0x3f
 #define ABS_CNT			(ABS_MAX+1)