diff options
author | Jiri Kosina <jkosina@suse.cz> | 2013-07-04 15:01:01 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-07-04 15:01:01 +0200 |
commit | db58316892a5e9034efe718d4c1630788db7528f (patch) | |
tree | c12d57181bb65807b0b7260163667cbd6308822b /arch/x86/pci/numachip.c | |
parent | HID: input: return ENODATA if reading battery attrs fails (diff) | |
parent | HID: elo: add quirks for broken firmware (diff) | |
parent | HID: holtek-mouse: use module_hid_driver() to simplify the code (diff) | |
parent | HID: i2c-hid: support sending HID output reports using the output register (diff) | |
download | linux-db58316892a5e9034efe718d4c1630788db7528f.tar.xz linux-db58316892a5e9034efe718d4c1630788db7528f.zip |
Merge branches 'for-3.11/battery', 'for-3.11/elo', 'for-3.11/holtek' and 'for-3.11/i2c-hid-fixed' into for-linus