diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-02-21 10:42:39 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-02-21 10:42:39 +0100 |
| commit | 539cf54bdd922474d22585837c9fec3343d7061b (patch) | |
| tree | b91e4ca6d5dc682152f82cc1f645faf5b526ebe8 /drivers/hid | |
| parent | HID: uhid: make creating devices work on 64/32 systems (diff) | |
| parent | HID: sensor-hub: don't limit the driver only to USB bus (diff) | |
| parent | HID: hidraw: print message when succesfully initialized (diff) | |
| parent | HID: i2c-hid: add ACPI support (diff) | |
| download | linux-539cf54bdd922474d22585837c9fec3343d7061b.tar.xz linux-539cf54bdd922474d22585837c9fec3343d7061b.zip | |
Merge branches 'for-3.8/upstream-fixes', 'for-3.9/hid-sensor', 'for-3.9/hidraw' and 'for-3.9/i2c-hid' into for-linus
Conflicts:
drivers/hid/i2c-hid/i2c-hid.c