Merge branches 'for-3.9/logitech', 'for-3.9/multitouch', 'for-3.9/ntrig', 'for-3.9/thingm' and 'for-3.9/upstream' into for-linus

2013-02-21 10:45:01 +01:00
parent 539cf54bdd 483f86a54c 7e3cc447ff 1b474fe82d 30ba2fbde1
commit 73759518d6
66 changed files with 759 additions and 805 deletions
--- a/include/uapi/linux/uhid.h
+++ b/include/uapi/linux/uhid.h
@@ -86,7 +86,7 @@ struct uhid_feature_answer_req {
 	__u16 err;
 	__u16 size;
 	__u8 data[UHID_DATA_MAX];
-};
+} __attribute__((__packed__));

 struct uhid_event {
 	__u32 type;