diff options
author | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 11:29:23 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 11:29:23 +0200 |
commit | b3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e (patch) | |
tree | c1766259ad622bfde87fe38f72be81bbefc49096 /include/mtd/inftl-user.h | |
parent | HID: hyperv: Set the hid drvdata correctly (diff) | |
parent | HID: hid-lg4ff: remove unused label in !LEDS_CLASS case (diff) | |
parent | HID: hid-multitouch: fix wrong protocol detection (diff) | |
download | linux-b3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e.tar.xz linux-b3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e.zip |
Merge branches 'device-groups', 'logitech' and 'multitouch' into for-linus